Removed the extra #cgo directives from the Unix files. cgo collects directives from ALL files, rather than using each file's directive individually, so having them combined like this is pointless. Instead, the #cgo directives are (or is, since there's only one) in uitask_unix.go. Will do the same for Mac next; this will help since we're going to add a CFLAGS value afterward.
This commit is contained in:
parent
4e820e86fc
commit
a48dd80add
|
@ -10,7 +10,6 @@ import (
|
|||
"image"
|
||||
)
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
// extern gboolean our_area_draw_callback(GtkWidget *, cairo_t *, gpointer);
|
||||
// extern gboolean our_area_button_press_event_callback(GtkWidget *, GdkEvent *, gpointer);
|
||||
|
|
|
@ -14,7 +14,6 @@ cgo doesn't support calling Go functions by default; we have to mark them for ex
|
|||
while we're at it the callback for our idle function will be handled here too
|
||||
*/
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
// extern gboolean our_window_delete_event_callback(GtkWidget *, GdkEvent *, gpointer);
|
||||
// extern gboolean our_window_configure_event_callback(GtkWidget *, GdkEvent *, gpointer);
|
||||
|
|
|
@ -8,7 +8,6 @@ import (
|
|||
"unsafe"
|
||||
)
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
// /* because cgo seems to choke on ... */
|
||||
// /* TODO does NULL parent make the box application-global? docs are unclear */
|
||||
|
|
|
@ -10,7 +10,6 @@ import (
|
|||
"unsafe"
|
||||
)
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
import "C"
|
||||
|
||||
|
|
|
@ -13,7 +13,6 @@ import (
|
|||
// toxxxx() converts from Go type to GTK+ type
|
||||
// Listbox casts are stored in listbox_unix.go
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
import "C"
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ For more information, read
|
|||
and the GTK+ reference documentation.
|
||||
*/
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
// /* because cgo seems to choke on ... */
|
||||
// void gtkTreeModelGet(GtkTreeModel *model, GtkTreeIter *iter, gchar **gs)
|
||||
|
|
|
@ -8,7 +8,6 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
// #cgo pkg-config: gtk+-3.0
|
||||
// #include "gtk_unix.h"
|
||||
import "C"
|
||||
|
||||
|
|
Loading…
Reference in New Issue