Simplified some GTK_CHECK_VERSION to improve readability.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38708 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/main_statusbar.c b/gtk/main_statusbar.c
index c7eb812807525147de52670971d3037cc0fde98c..3f4d82a6e515824dc4869dc67af899bc845180f3 100644 (file)
--- a/gtk/main_statusbar.c
+++ b/gtk/main_statusbar.c
@@ -418,8 +418,7 @@ info_bar_new(void)
     file_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(info_bar), "file");
     help_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(info_bar), "help");
     filter_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(info_bar), "filter");
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
     gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(info_bar), FALSE);
 #endif
     gtk_statusbar_push(GTK_STATUSBAR(info_bar), main_ctx, DEF_READY_MESSAGE);
@@ -437,8 +436,7 @@ packets_bar_new(void)
     packets_bar = gtk_statusbar_new();
     packets_ctx = gtk_statusbar_get_context_id(GTK_STATUSBAR(packets_bar), "packets");
     packets_bar_update();
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
     gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(packets_bar), FALSE);
 #endif
 

diff --git a/gtk/packet_list_store.c b/gtk/packet_list_store.c
index b0951fc573c4fa7cc9bb1290b55e5eedb8810b86..3ddf411af7058efaaf6f1e42a7483090a1692c89 100644 (file)
--- a/gtk/packet_list_store.c
+++ b/gtk/packet_list_store.c
@@ -186,8 +186,7 @@ packet_list_class_init(PacketListClass *klass)
 
        object_class->finalize = packet_list_finalize;
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        /* XXX this seems to affect TreeView Application wide
         * Move to main.c ??? as it's not a bad thing(tm)
         */

diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index 7248728cc1ed83c5d7eb7eec20098e0a832d73f2..1beadb3eadf8cc866951c087e5b6171df2d8d8c4 100644 (file)
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -1976,8 +1976,7 @@ decode_streams(void)
        statusbar_context = gtk_statusbar_get_context_id((GtkStatusbar *) info_bar, "main");
        gtk_statusbar_push((GtkStatusbar *) info_bar, statusbar_context, "  Decoding RTP packets...");
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(info_bar), FALSE);
 #endif
        /* reset the number of packet to be decoded, this is used for the progress bar */
@@ -2024,8 +2023,7 @@ decode_streams(void)
        gtk_widget_show_all(main_scrolled_window);
 
        gtk_widget_destroy(progress_bar);
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(info_bar), TRUE);
 #endif
        gtk_statusbar_pop((GtkStatusbar *) info_bar, statusbar_context);
@@ -2239,8 +2237,7 @@ rtp_player_dlg_create(void)
 
        /* statusbar */
        info_bar = gtk_statusbar_new();
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(info_bar), TRUE);
 #endif
        gtk_box_pack_start(GTK_BOX(stat_hbox), info_bar, TRUE, TRUE, 0);

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index d89d90b71cc5244d5307c0ac6da9eca64d5dfb81..93ebeea29a258033c33925799a9aab014dd672b2 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -309,8 +309,7 @@ struct graph {
                                                 * temporary
                                                 */
        PangoFontDescription *font;     /* font used for annotations etc. */
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        GdkGC *fg_gc;
 #endif
 #if GTK_CHECK_VERSION(2,22,0)
@@ -366,8 +365,7 @@ struct graph {
        } gt;
 };
 
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
 static GdkGC *xor_gc = NULL;
 #endif
 static int refnum=0;
@@ -806,8 +804,7 @@ static void create_drawing_area (struct graph *g)
 #else
        g->font = gtk_widget_get_style(g->drawing_area)->font_desc;
 #endif
-#if GTK_CHECK_VERSION(3,0,0)
-#else
+#if !GTK_CHECK_VERSION(3,0,0)
        colormap = gtk_widget_get_colormap(GTK_WIDGET(g->drawing_area));
        if (!xor_gc) {
                xor_gc = gdk_gc_new (gtk_widget_get_window(g->drawing_area));