aboutsummaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-07-21 08:51:08 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2004-07-21 08:51:08 +0000
commit1824fa29c2092c9a26a5e4b11ff5b92174d1a73a (patch)
tree269e5e74fb61178099772fe517aa8f1e4095811f /gtk
parent6041d12ddecba3efc40c4f0436def76fc616712f (diff)
downloadwireshark-1824fa29c2092c9a26a5e4b11ff5b92174d1a73a.tar.gz
wireshark-1824fa29c2092c9a26a5e4b11ff5b92174d1a73a.tar.bz2
wireshark-1824fa29c2092c9a26a5e4b11ff5b92174d1a73a.zip
GdkDisplay is only available in gtk 2.2 and later
it is not available in gtk 2.0 which all of us using more prooven and stable (==obsolete) versions use. svn path=/trunk/; revision=11455
Diffstat (limited to 'gtk')
-rw-r--r--gtk/hostlist_table.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 1ea88ce85d..388a580c42 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -543,7 +543,8 @@ draw_hostlist_table_data(hostlist_table *hl)
gtk_clist_thaw(hl->table);
}
-#if GTK_MAJOR_VERSION >= 2
+/* GdkDisplay is only available in GTK 2.2 and later */
+#if (GTK_MAJOR_VERSION > 2) || ( (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 2) )
static void
copy_as_csv_cb(GtkWindow *win _U_, gpointer data)
{
@@ -594,7 +595,7 @@ init_hostlist_table_page(hostlist_table *hosttable, GtkWidget *vbox, gboolean hi
GtkWidget *column_lb;
GString *error_string;
char title[256];
-#if GTK_MAJOR_VERSION >= 2
+#if (GTK_MAJOR_VERSION > 2) || ( (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 2) )
GtkWidget *copy_bt;
GtkTooltips *tooltips = gtk_tooltips_new();
#endif
@@ -687,7 +688,7 @@ init_hostlist_table_page(hostlist_table *hosttable, GtkWidget *vbox, gboolean hi
/* create popup menu for this table */
hostlist_create_popup_menu(hosttable);
-#if GTK_MAJOR_VERSION >= 2
+#if (GTK_MAJOR_VERSION > 2) || ( (GTK_MAJOR_VERSION == 2) && (GTK_MINOR_VERSION >= 2) )
copy_bt = gtk_button_new_with_label ("Copy content to clipboard as CSV");
gtk_tooltips_set_tip(tooltips, copy_bt, "Copy all statistical values to the clipboard in CSV (Comma Seperated Values) format.", NULL);
SIGNAL_CONNECT(copy_bt, "clicked", copy_as_csv_cb,(gpointer *) hosttable);