From 8c49544efd0a723bd6ca9700231a743712e48ff8 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Sat, 20 Aug 2011 11:47:26 -0400 Subject: [PATCH] Created helper for connecting signals This should make connecting signals easier, since I don't need to use any conversion macros. --- gui/window.cpp | 2 +- include/ocarina/gtk.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/window.cpp b/gui/window.cpp index 1ebe858a..22bc4367 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -18,7 +18,7 @@ void window_resize(int w, int h) void window_init() { window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(window, "destroy", G_CALLBACK(destroy_window), NULL); + GTK_CONNECT(window, "destroy", destroy_window, NULL); window_resize(800, 600); gtk_widget_show(window); } diff --git a/include/ocarina/gtk.h b/include/ocarina/gtk.h index b677c4a7..97de2f64 100644 --- a/include/ocarina/gtk.h +++ b/include/ocarina/gtk.h @@ -5,6 +5,9 @@ extern "C" { #include } +#define GTK_CONNECT(widget, event, func, arg) \ + g_signal_connect(widget, event, G_CALLBACK(func), arg) + void box_pack_start(GtkWidget *, GtkWidget *, gboolean, gboolean, guint); void container_add(GtkWidget *, GtkWidget *);