aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-11-11 17:30:26 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-11-11 17:30:26 +0000
commit1656460fc921365a668f3b4bdc1f1173d47b6ee8 (patch)
treefa30f4a054c39075b08faca2b49e41e77fdeb240 /gtk
parentabcdcd8bb5b05ac3193ff17c47b6b0e0c755e040 (diff)
Put in some missing macros needed for recent changes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6611 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
-rw-r--r--gtk/compat_macros.h26
1 files changed, 22 insertions, 4 deletions
diff --git a/gtk/compat_macros.h b/gtk/compat_macros.h
index bbc07d2e76..c50ae0fc33 100644
--- a/gtk/compat_macros.h
+++ b/gtk/compat_macros.h
@@ -1,7 +1,7 @@
/* compat_macros.h
* GTK-related Global defines, etc.
*
- * $Id: compat_macros.h,v 1.1 2002/11/09 20:00:35 oabad Exp $
+ * $Id: compat_macros.h,v 1.2 2002/11/11 17:30:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -58,7 +58,16 @@ gtk_object_get_data(GTK_OBJECT(widget), key)
#define WIDGET_SET_SIZE(widget, width, height) \
gtk_widget_set_usize(GTK_WIDGET(widget), width, height);
-#else
+#define SIGNAL_EMIT_BY_NAME(widget, name) \
+gtk_signal_emit_by_name(GTK_OBJECT(widget), name);
+
+#define SIGNAL_EMIT_BY_NAME1(widget, name, arg) \
+gtk_signal_emit_by_name(GTK_OBJECT(widget), name, arg);
+
+#define SIGNAL_EMIT_STOP_BY_NAME(widget, name) \
+gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), name);
+
+#else /* GTK_MAJOR_VERSION >= 2 */
#define SIGNAL_CONNECT(widget, name, callback, arg) \
g_signal_connect(G_OBJECT(widget), name, G_CALLBACK(callback), \
@@ -84,6 +93,15 @@ g_object_get_data(G_OBJECT(widget), key)
#define WIDGET_SET_SIZE(widget, width, height) \
gtk_widget_set_size_request(GTK_WIDGET(widget), width, height);
-#endif
+#define SIGNAL_EMIT_BY_NAME(widget, name) \
+g_signal_emit_by_name(G_OBJECT(widget), name);
+
+#define SIGNAL_EMIT_BY_NAME1(widget, name, arg) \
+g_signal_emit_by_name(G_OBJECT(widget), name, arg);
+
+#define SIGNAL_EMIT_STOP_BY_NAME(widget, name) \
+g_signal_stop_emission_by_name(G_OBJECT(widget), name);
+
+#endif /* GTK_MAJOR_VERSION */
-#endif
+#endif /* __COMPAT_MACROS_H__ */