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:
Pietro Gagliardi 2014-05-19 22:32:38 -04:00
parent 4e820e86fc
commit a48dd80add
7 changed files with 0 additions and 7 deletions

View File

@ -10,7 +10,6 @@ import (
"image" "image"
) )
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
// extern gboolean our_area_draw_callback(GtkWidget *, cairo_t *, gpointer); // extern gboolean our_area_draw_callback(GtkWidget *, cairo_t *, gpointer);
// extern gboolean our_area_button_press_event_callback(GtkWidget *, GdkEvent *, gpointer); // extern gboolean our_area_button_press_event_callback(GtkWidget *, GdkEvent *, gpointer);

View File

@ -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 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" // #include "gtk_unix.h"
// extern gboolean our_window_delete_event_callback(GtkWidget *, GdkEvent *, gpointer); // extern gboolean our_window_delete_event_callback(GtkWidget *, GdkEvent *, gpointer);
// extern gboolean our_window_configure_event_callback(GtkWidget *, GdkEvent *, gpointer); // extern gboolean our_window_configure_event_callback(GtkWidget *, GdkEvent *, gpointer);

View File

@ -8,7 +8,6 @@ import (
"unsafe" "unsafe"
) )
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
// /* because cgo seems to choke on ... */ // /* because cgo seems to choke on ... */
// /* TODO does NULL parent make the box application-global? docs are unclear */ // /* TODO does NULL parent make the box application-global? docs are unclear */

View File

@ -10,7 +10,6 @@ import (
"unsafe" "unsafe"
) )
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
import "C" import "C"

View File

@ -13,7 +13,6 @@ import (
// toxxxx() converts from Go type to GTK+ type // toxxxx() converts from Go type to GTK+ type
// Listbox casts are stored in listbox_unix.go // Listbox casts are stored in listbox_unix.go
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
import "C" import "C"

View File

@ -29,7 +29,6 @@ For more information, read
and the GTK+ reference documentation. and the GTK+ reference documentation.
*/ */
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
// /* because cgo seems to choke on ... */ // /* because cgo seems to choke on ... */
// void gtkTreeModelGet(GtkTreeModel *model, GtkTreeIter *iter, gchar **gs) // void gtkTreeModelGet(GtkTreeModel *model, GtkTreeIter *iter, gchar **gs)

View File

@ -8,7 +8,6 @@ import (
"time" "time"
) )
// #cgo pkg-config: gtk+-3.0
// #include "gtk_unix.h" // #include "gtk_unix.h"
import "C" import "C"