From a48dd80add7760e58b8e4e639183ec204ac699af Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Mon, 19 May 2014 22:32:38 -0400 Subject: [PATCH] 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. --- area_unix.go | 1 - callbacks_unix.go | 1 - dialog_unix.go | 1 - gtkcalls_unix.go | 1 - gtkcasts_unix.go | 1 - listbox_unix.go | 1 - sysdata_unix.go | 1 - 7 files changed, 7 deletions(-) diff --git a/area_unix.go b/area_unix.go index 2d3522d..92e9f94 100644 --- a/area_unix.go +++ b/area_unix.go @@ -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); diff --git a/callbacks_unix.go b/callbacks_unix.go index 8fb52b5..f072cb2 100644 --- a/callbacks_unix.go +++ b/callbacks_unix.go @@ -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); diff --git a/dialog_unix.go b/dialog_unix.go index c3c506c..03ffe3d 100644 --- a/dialog_unix.go +++ b/dialog_unix.go @@ -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 */ diff --git a/gtkcalls_unix.go b/gtkcalls_unix.go index ae6ccbe..8c00ff1 100644 --- a/gtkcalls_unix.go +++ b/gtkcalls_unix.go @@ -10,7 +10,6 @@ import ( "unsafe" ) -// #cgo pkg-config: gtk+-3.0 // #include "gtk_unix.h" import "C" diff --git a/gtkcasts_unix.go b/gtkcasts_unix.go index a2395a4..5c02223 100644 --- a/gtkcasts_unix.go +++ b/gtkcasts_unix.go @@ -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" diff --git a/listbox_unix.go b/listbox_unix.go index 8b3c279..f769f51 100644 --- a/listbox_unix.go +++ b/listbox_unix.go @@ -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) diff --git a/sysdata_unix.go b/sysdata_unix.go index a1b9858..1234e7c 100644 --- a/sysdata_unix.go +++ b/sysdata_unix.go @@ -8,7 +8,6 @@ import ( "time" ) -// #cgo pkg-config: gtk+-3.0 // #include "gtk_unix.h" import "C"