Create a file containing macros to provide the access-functions

when the gtk version is too old (for the 2,14,0 case).

Remove all old access methods that were guarded by 2,14,0 tests.

Feel free to do the same for newer guards :-)

svn path=/trunk/; revision=38147

20 files changed, 76 insertions, 235 deletions

diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 2755a17935..68da1a2fac 100644
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -46,6 +46,7 @@
 #include "gtk/color_edit_dlg.h"
 #include "gtk/filter_autocomplete.h"
 
+#include "gtk/old-gtk-compat.h"
 
 #define BUTTON_SIZE_X -1
 #define BUTTON_SIZE_Y -1
@@ -464,11 +465,7 @@ color_sel_win_new(color_filter_t *colorf, gboolean is_bg)
 
   if (color != NULL) {
     color_t_to_gdkcolor(&gcolor, color);
-#if GTK_CHECK_VERSION(2,14,0)
     gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_sel_win))), &gcolor);
-#else
-    gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_sel_win)->colorsel), &gcolor);
-#endif
   }
 
   g_object_get(color_sel_win, "ok-button", &color_sel_ok, NULL);
@@ -546,11 +543,7 @@ color_sel_ok_cb                        (GtkButton       *button _U_,
 
   color_dialog = (GtkWidget *)user_data;
 
-#if GTK_CHECK_VERSION(2,14,0)
   gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(color_dialog))), &new_color);
-#else
-  gtk_color_selection_get_current_color(GTK_COLOR_SELECTION(GTK_COLOR_SELECTION_DIALOG(color_dialog)->colorsel), &new_color);
-#endif
 
   if ( ! get_color(&new_color) ){
     simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index a54beac33c..1a853d1163 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -56,6 +56,8 @@
 #include "gtk/keys.h"
 #include "gtk/utf8_entities.h"
 
+#include "old-gtk-compat.h"
+
 #define COL_STR_LEN 16
 #define CONV_PTR_KEY "conversations-pointer"
 #define NB_PAGES_KEY "notebook-pages"
@@ -2576,11 +2578,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     window_present(conversations->win);
 
     cf_retap_packets(&cfile);
-#if GTK_CHECK_VERSION(2,14,0)
     gdk_window_raise(gtk_widget_get_window(conversations->win));
-#else
-    gdk_window_raise(conversations->win->window);
-#endif
 }
 
 
@@ -2719,11 +2717,7 @@ ct_filter_toggle_dest(GtkWidget *widget, gpointer data)
 
     cf_retap_packets(&cfile);
     if (conversations) {
-#if GTK_CHECK_VERSION(2,14,0)
         gdk_window_raise(gtk_widget_get_window(conversations->win));
-#else
-        gdk_window_raise(conversations->win->window);
-#endif
     }
 }
 
@@ -2834,11 +2828,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     window_present(win);
 
     cf_retap_packets(&cfile);
-#if GTK_CHECK_VERSION(2,14,0)
     gdk_window_raise(gtk_widget_get_window(win));
-#else
-    gdk_window_raise(win->window);
-#endif
 }
 
 typedef struct _key {
diff --git a/gtk/drag_and_drop.c b/gtk/drag_and_drop.c
index c9c22d1ee8..7c0e334cb6 100644
--- a/gtk/drag_and_drop.c
+++ b/gtk/drag_and_drop.c
@@ -52,6 +52,8 @@
 #include "gtk/capture_globals.h"
 #endif
 
+#include "gtk/old-gtk-compat.h"
+
 #ifdef HAVE_GTKOSXAPPLICATION
 #include <igemacintegration/gtkosxapplication.h>
 #endif
@@ -342,13 +344,8 @@ dnd_data_received(GtkWidget *widget _U_, GdkDragContext *dc _U_, gint x _U_, gin
 
 	/* the selection_data will soon be gone, make a copy first */
 	/* the data string is not zero terminated -> make a zero terminated "copy" of it */
-#if GTK_CHECK_VERSION(2,14,0)
 	sel_data_len = gtk_selection_data_get_length(selection_data);
 	sel_data_data = gtk_selection_data_get_data(selection_data);
-#else
-	sel_data_len = selection_data->length;
-	sel_data_data = selection_data->data;
-#endif
 	cf_names_freeme = g_malloc(sel_data_len + 1);
 	memcpy(cf_names_freeme, sel_data_data, sel_data_len);
 	cf_names_freeme[sel_data_len] = '\0';
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c
index fbd8e12eac..25fc64d79d 100644
--- a/gtk/expert_comp_table.c
+++ b/gtk/expert_comp_table.c
@@ -55,6 +55,8 @@
 #include "gtk/stock_icons.h"
 #include "gtk/utf8_entities.h"
 
+#include "gtk/old-gtk-compat.h"
+
 const char  *packet = "Packet:";
 
 enum
@@ -278,11 +280,7 @@ error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint call
     case ACTION_MATCH:
         gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
         main_filter_packets(&cfile, str, FALSE);
-#if GTK_CHECK_VERSION(2,14,0)
 	gdk_window_raise(gtk_widget_get_window(top_level));
-#else
-        gdk_window_raise(top_level->window);
-#endif
         break;
     case ACTION_PREPARE:
         gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
diff --git a/gtk/filter_autocomplete.c b/gtk/filter_autocomplete.c
index d0e6e87988..0c85c0ff41 100644
--- a/gtk/filter_autocomplete.c
+++ b/gtk/filter_autocomplete.c
@@ -44,6 +44,8 @@
 #include "gtk/gui_utils.h"
 #include "gtk/filter_autocomplete.h"
 
+#include "gtk/old-gtk-compat.h"
+
 #define E_FILT_AUTOCOMP_TREE_KEY    "filter_autocomplete_tree"
 
 
@@ -768,11 +770,7 @@ filter_autocomplete_new(GtkWidget *filter_te, const gchar *protocol_name,
   gtk_window_resize(GTK_WINDOW(popup_win), filter_te_alloc.width,
                     (requisition.height<200? requisition.height+8:200));
 
-#if GTK_CHECK_VERSION(2,14,0)
   gdk_window_get_origin(gtk_widget_get_window(filter_te), &x_pos, &y_pos);
-#else
-  gdk_window_get_origin(filter_te->window, &x_pos, &y_pos);
-#endif
   y_pos = y_pos + filter_te_alloc.height;
   gtk_window_move(GTK_WINDOW(popup_win), x_pos, y_pos);
 
diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index acaf0cc3ff..cf6aabcee3 100644
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -48,6 +48,8 @@
 #include "gtk/help_dlg.h"
 #include "gtk/filter_autocomplete.h"
 
+#include "gtk/old-gtk-compat.h"
+
 #define E_FILT_DIALOG_PTR_KEY       "filter_dialog_ptr"
 #define E_FILT_BUTTON_PTR_KEY       "filter_button_ptr"
 #define E_FILT_PARENT_FILTER_TE_KEY "filter_parent_filter_te"
@@ -633,11 +635,7 @@ filter_dialog_new(GtkWidget *button, GtkWidget *parent_filter_te,
 
     if(construct_args->modal_and_transient) {
         parent = gtk_widget_get_parent_window(parent_filter_te);
-#if GTK_CHECK_VERSION(2,14,0)
         gdk_window_set_transient_for(gtk_widget_get_window(main_w), parent);
-#else
-        gdk_window_set_transient_for(main_w->window, parent);
-#endif
         gtk_window_set_modal(GTK_WINDOW(main_w), TRUE);
     }
 
diff --git a/gtk/filter_utils.c b/gtk/filter_utils.c
index eeceaf6e83..c69d13a6e7 100644
--- a/gtk/filter_utils.c
+++ b/gtk/filter_utils.c
@@ -34,6 +34,8 @@
 #include "gtk/color_dlg.h"
 #include "gtk/filter_utils.h"
 
+#include "gtk/old-gtk-compat.h"
+
 void
 apply_selected_filter (guint callback_action, char *filter)
 {
@@ -83,11 +85,7 @@ apply_selected_filter (guint callback_action, char *filter)
 	case ACTION_MATCH:
 		gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
 		main_filter_packets(&cfile, str, FALSE);
-#if GTK_CHECK_VERSION(2,14,0)
 		gdk_window_raise(gtk_widget_get_window(top_level));
-#else
-		gdk_window_raise(top_level->window);
-#endif
 		break;
 	case ACTION_PREPARE:
 		gtk_entry_set_text(GTK_ENTRY(main_display_filter_widget), str);
diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index dece49455f..6f23f7e0fa 100644
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -63,6 +63,9 @@
 #include "gtk/dlg_utils.h"
 #include "gtk/main.h"
 #include "gtk/graph_analysis.h"
+
+#include "gtk/old-gtk-compat.h"
+
 #include "../image/voip_select.xpm"
 #include "../image/voip_bg.xpm"
 
@@ -1047,19 +1050,11 @@ static void dialog_graph_draw(graph_analysis_data_t *user_data)
 						draw_area_comments_alloc.width, draw_area_comments_alloc.height);
 
 	/* update the v_scrollbar */
-#if GTK_CHECK_VERSION(2,14,0)
 	gtk_adjustment_set_upper(user_data->dlg.v_scrollbar_adjustment, (gdouble) user_data->num_items-1);
 	gtk_adjustment_set_step_increment(user_data->dlg.v_scrollbar_adjustment, 1);
 	gtk_adjustment_set_page_increment(user_data->dlg.v_scrollbar_adjustment, (gdouble) (last_item-first_item));
 	gtk_adjustment_set_page_size(user_data->dlg.v_scrollbar_adjustment, (gdouble) (last_item-first_item));
 	gtk_adjustment_set_value(user_data->dlg.v_scrollbar_adjustment, (gdouble) first_item);
-#else
-	user_data->dlg.v_scrollbar_adjustment->upper=(gfloat) user_data->num_items-1;
-	user_data->dlg.v_scrollbar_adjustment->step_increment=1;
-	user_data->dlg.v_scrollbar_adjustment->page_increment=(gfloat) (last_item-first_item);
-	user_data->dlg.v_scrollbar_adjustment->page_size=(gfloat) (last_item-first_item);
-	user_data->dlg.v_scrollbar_adjustment->value=(gfloat) first_item;
-#endif
 
 	gtk_adjustment_changed(user_data->dlg.v_scrollbar_adjustment);
 	gtk_adjustment_value_changed(user_data->dlg.v_scrollbar_adjustment);
@@ -1110,15 +1105,9 @@ static gboolean scroll_event(GtkWidget *widget _U_, GdkEventScroll *event, gpoin
 			user_data->dlg.first_item -= 3;
 		break;
 	case(GDK_SCROLL_DOWN):
-#if GTK_CHECK_VERSION(2,14,0)
 		if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1 == user_data->num_items)) return TRUE;
 		if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1) > (user_data->num_items-3))
 			user_data->dlg.first_item = user_data->num_items-(guint32)gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)-1;
-#else
-		if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)) return TRUE;
-		if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1) > (user_data->num_items-3))
-			user_data->dlg.first_item = user_data->num_items-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size-1;
-#endif
 		else
 			user_data->dlg.first_item += 3;
 	    break;
@@ -1144,24 +1133,14 @@ static gboolean key_press_event(GtkWidget *widget _U_, GdkEventKey *event, gpoin
 	if (event->keyval == GDK_Up){
 		if (user_data->dlg.selected_item == 0) return TRUE;
 		user_data->dlg.selected_item--;
-#if GTK_CHECK_VERSION(2,14,0)
 		if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)) )
-#else
-		if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
-#endif
 			user_data->dlg.first_item = user_data->dlg.selected_item;
 		/* Down arrow */
 	} else if (event->keyval == GDK_Down){
 		if (user_data->dlg.selected_item == user_data->num_items-1) return TRUE;
 		user_data->dlg.selected_item++;
-#if GTK_CHECK_VERSION(2,14,0)
 		if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)) )
 			user_data->dlg.first_item = (guint32)user_data->dlg.selected_item-(guint32)gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment);
-#else
-		if ( (user_data->dlg.selected_item<user_data->dlg.first_item) || (user_data->dlg.selected_item>user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size) )
-			user_data->dlg.first_item = (guint32)user_data->dlg.selected_item-(guint32)user_data->dlg.v_scrollbar_adjustment->page_size;
-#endif
-
 	} else if (event->keyval == GDK_Left){
 		if (user_data->dlg.first_node == 0) return TRUE;
 		user_data->dlg.first_node--;
@@ -1299,11 +1278,7 @@ static gboolean configure_event(GtkWidget *widget, GdkEventConfigure *event _U_,
 	widget_style = widget->style;
 #endif
 
-#if GTK_CHECK_VERSION(2,14,0)
 	user_data->dlg.pixmap_main=gdk_pixmap_new(gtk_widget_get_window(widget),
-#else
-	user_data->dlg.pixmap_main=gdk_pixmap_new(widget->window,
-#endif
 		widget_alloc.width,
 		widget_alloc.height,
 		-1);
@@ -1361,12 +1336,7 @@ static gboolean configure_event_comments(GtkWidget *widget, GdkEventConfigure *e
 		user_data->dlg.pixmap_comments=NULL;
 	}
 
-#if GTK_CHECK_VERSION(2,14,0)
 	user_data->dlg.pixmap_comments=gdk_pixmap_new(gtk_widget_get_window(widget),
-#else
-	user_data->dlg.pixmap_comments=gdk_pixmap_new(widget->window,
-#endif
-
 						widget_alloc.width,
 						widget_alloc.height,
 						-1);
@@ -1403,11 +1373,7 @@ static gboolean configure_event_time(GtkWidget *widget, GdkEventConfigure *event
 		user_data->dlg.pixmap_time=NULL;
 	}
 
-#if GTK_CHECK_VERSION(2,14,0)
 	user_data->dlg.pixmap_time=gdk_pixmap_new(gtk_widget_get_window(widget),
-#else
-	user_data->dlg.pixmap_time=gdk_pixmap_new(widget->window,
-#endif
 						widget_alloc.width,
 						widget_alloc.height,
 						-1);
@@ -1471,7 +1437,6 @@ static void v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 {
 	graph_analysis_data_t *user_data = data;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	if ((user_data->dlg.first_item+gtk_adjustment_get_page_size(user_data->dlg.v_scrollbar_adjustment)+1 == user_data->num_items)
 	    && (gtk_adjustment_get_value(user_data->dlg.v_scrollbar_adjustment) >= user_data->dlg.first_item ))
 		return;
@@ -1480,16 +1445,6 @@ static void v_scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 		return;
 
 	user_data->dlg.first_item = (guint32) gtk_adjustment_get_value(user_data->dlg.v_scrollbar_adjustment);
-#else
-	if ((user_data->dlg.first_item+user_data->dlg.v_scrollbar_adjustment->page_size+1 == user_data->num_items)
-	    && (user_data->dlg.v_scrollbar_adjustment->value >= user_data->dlg.first_item ))
-		return;
-
-	if (user_data->dlg.first_item == user_data->dlg.v_scrollbar_adjustment->value)
-		return;
-
-	user_data->dlg.first_item = (guint32) user_data->dlg.v_scrollbar_adjustment->value;
-#endif
 
 	dialog_graph_redraw(user_data);
 
diff --git a/gtk/gtkvumeter.c b/gtk/gtkvumeter.c
index abbc3f18bc..d7a5adfe03 100644
--- a/gtk/gtkvumeter.c
+++ b/gtk/gtkvumeter.c
@@ -20,6 +20,7 @@
 #include <gtk/gtk.h>
 #include "gtk/gtkvumeter.h"
 
+#include "gtk/old-gtk-compat.h"
 
 #define MIN_DYNAMIC_SIDE    40
 
@@ -188,17 +189,10 @@ static void gtk_vumeter_realize (GtkWidget *widget)
     widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
 #endif
 
-#if GTK_CHECK_VERSION(2,14,0)
     gtk_widget_set_style(widget, gtk_style_attach(gtk_widget_get_style(widget), gtk_widget_get_window(widget)));
 
     gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
     gtk_style_set_background (gtk_widget_get_style(widget), gtk_widget_get_window(widget),  GTK_STATE_NORMAL);
-#else
-    widget->style = gtk_style_attach (widget->style, widget->window);
-
-    gdk_window_set_user_data (widget->window, widget);
-    gtk_style_set_background (widget->style, widget->window,  GTK_STATE_NORMAL);
-#endif
 
     /* colors */
     vumeter->colormap = gdk_colormap_get_system ();
@@ -301,11 +295,7 @@ static void gtk_vumeter_size_allocate (GtkWidget *widget, GtkAllocation *allocat
     if (GTK_WIDGET_REALIZED (widget)) {
 #endif
 
-#if GTK_CHECK_VERSION(2,14,0)
         gdk_window_move_resize (gtk_widget_get_window(widget), allocation->x, allocation->y,
-#else
-        gdk_window_move_resize (widget->window, allocation->x, allocation->y,
-#endif
 			MAX (allocation->width, requisition.width),
             MAX (allocation->height, requisition.height));
 
@@ -322,11 +312,7 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
     gint w, h, inc;
     GList * current;
     GtkAllocation widget_alloc;
-#if GTK_CHECK_VERSION(2,14,0)
     GdkWindow *widget_window = gtk_widget_get_window(widget);
-#else
-    GdkWindow *widget_window = widget->window;
-#endif
 
     g_return_val_if_fail (GTK_IS_VUMETER (widget), FALSE);
     g_return_val_if_fail (event != NULL, FALSE);
@@ -647,19 +633,11 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
     for (index = 0; index < vumeter->colors; index++) {
         /* foreground */
         gdk_colormap_alloc_color (vumeter->colormap, &vumeter->f_colors[index], FALSE, TRUE);
-#if GTK_CHECK_VERSION(2,14,0)
         vumeter->f_gc[index] = gdk_gc_new(gtk_widget_get_window(GTK_WIDGET(vumeter)));
-#else
-        vumeter->f_gc[index] = gdk_gc_new(GTK_WIDGET(vumeter)->window);
-#endif
         gdk_gc_set_foreground(vumeter->f_gc[index], &vumeter->f_colors[index]);
         /* background */
         gdk_colormap_alloc_color (vumeter->colormap, &vumeter->b_colors[index], FALSE, TRUE);
-#if GTK_CHECK_VERSION(2,14,0)
         vumeter->b_gc[index] = gdk_gc_new(gtk_widget_get_window(GTK_WIDGET(vumeter)));
-#else
-        vumeter->b_gc[index] = gdk_gc_new(GTK_WIDGET(vumeter)->window);
-#endif
         gdk_gc_set_foreground(vumeter->b_gc[index], &vumeter->b_colors[index]);
     }
 }
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index a20e5634af..1c36035656 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -49,6 +49,8 @@
 #include "gtk/font_utils.h"
 #include "gtk/recent.h"
 
+#include "gtk/old-gtk-compat.h"
+
 #include "image/wsicon16.xpm"
 
 #include "../version_info.h"
@@ -119,22 +121,12 @@ window_icon_realize_cb (GtkWidget *win, gpointer data _U_)
     style = gtk_widget_get_style (win);
 
     if (icon_pmap == NULL) {
-#if GTK_CHECK_VERSION(2,14,0)
         icon_pmap = gdk_pixmap_create_from_xpm_d (gtk_widget_get_window(win),
                                                   &icon_mask, &style->bg[GTK_STATE_NORMAL],
                                                   (gchar **) wsicon16_xpm);
-#else
-        icon_pmap = gdk_pixmap_create_from_xpm_d (win->window,
-                                                  &icon_mask, &style->bg[GTK_STATE_NORMAL],
-                                                  (gchar **) wsicon16_xpm);
-#endif
     }
 
-#if GTK_CHECK_VERSION(2,14,0)
     gdk_window_set_icon (gtk_widget_get_window(win), NULL, icon_pmap, icon_mask);
-#else /* GTK_CHECK_VERSION(2,14,0) */
-    gdk_window_set_icon (win->window, NULL, icon_pmap, icon_mask);
-#endif /* GTK_CHECK_VERSION(2,14,0) */
 #endif
 }
 
@@ -320,11 +312,7 @@ window_get_geometry(GtkWidget *widget, window_geometry_t *geom)
 
     memset (geom, 0, sizeof (window_geometry_t));
 
-#if GTK_CHECK_VERSION(2,14,0)
     widget_window = gtk_widget_get_window(widget);
-#else
-    widget_window = widget->window;
-#endif
 
     gdk_window_get_root_origin(widget_window,
         &geom->x,
@@ -394,20 +382,11 @@ window_set_geometry(GtkWidget *widget, window_geometry_t *geom)
     }
 
     if(geom->set_maximized) {
-#if GTK_CHECK_VERSION(2,14,0)
         if (geom->maximized) {
             gdk_window_maximize(gtk_widget_get_window(widget));
         } else {
             gdk_window_unmaximize(gtk_widget_get_window(widget));
         }
-#else
-        if (geom->maximized) {
-            gdk_window_maximize(widget->window);
-        } else {
-            gdk_window_unmaximize(widget->window);
-        }
-
-#endif
     }
 }
 
@@ -848,11 +827,7 @@ reactivate_window(GtkWidget *win)
 {
     GdkWindow *win_window;
 
-#if GTK_CHECK_VERSION(2,14,0)
     win_window = gtk_widget_get_window(win);
-#else
-    win_window = win->window;
-#endif
 
     gdk_window_show(win_window);
     gdk_window_raise(win_window);
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 902f444a69..eeb8c0ddee 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -66,6 +66,8 @@
 #include "gtk/stock_icons.h"
 #endif
 
+#include "gtk/old-gtk-compat.h"
+
 #define HOST_PTR_KEY "hostlist-pointer"
 #define NB_PAGES_KEY "notebook-pages"
 
@@ -1397,11 +1399,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     window_present(hosttable->win);
 
     cf_retap_packets(&cfile);
-#if GTK_CHECK_VERSION(2,14,0)
     gdk_window_raise(gtk_widget_get_window(hosttable->win));
-#else
-    gdk_window_raise(hosttable->win->window);
-#endif
 }
 
 
@@ -1547,11 +1545,7 @@ hostlist_filter_toggle_dest(GtkWidget *widget, gpointer data)
 
     cf_retap_packets(&cfile);
     if (hosttable) {
-#if GTK_CHECK_VERSION(2,14,0)
         gdk_window_raise(gtk_widget_get_window(hosttable->win));
-#else
-        gdk_window_raise(hosttable->win->window);
-#endif
     }
 }
 
@@ -1671,11 +1665,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     window_present(win);
 
     cf_retap_packets(&cfile);
-#if GTK_CHECK_VERSION(2,14,0)
     gdk_window_raise(gtk_widget_get_window(win));
-#else
-    gdk_window_raise(win->window);
-#endif
 }
 
 /*
diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index 4d26a2a3ee..ebbad20cc8 100644
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -86,6 +86,8 @@
 #include "gtk/rtp_stream_dlg.h"
 #include "gtk/utf8_entities.h"
 
+#include "gtk/old-gtk-compat.h"
+
 enum
 {
 	PACKET_COLUMN,
@@ -1283,7 +1285,6 @@ static void dialog_graph_draw(user_data_t* user_data)
 
 
 	/* update the scrollbar */
-#if GTK_CHECK_VERSION(2,14,0)
 	gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) user_data->dlg.dialog_graph.max_interval);
 	gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10));
 	gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
@@ -1293,17 +1294,6 @@ static void dialog_graph_draw(user_data_t* user_data)
 		gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
 	}
 	gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment, last_interval - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
-#else
-	user_data->dlg.dialog_graph.scrollbar_adjustment->upper=(gfloat) user_data->dlg.dialog_graph.max_interval;
-	user_data->dlg.dialog_graph.scrollbar_adjustment->step_increment=(gfloat) ((last_interval-first_interval)/10);
-	user_data->dlg.dialog_graph.scrollbar_adjustment->page_increment=(gfloat) (last_interval-first_interval);
-	if((last_interval-first_interval)*100 < user_data->dlg.dialog_graph.max_interval){
-		user_data->dlg.dialog_graph.scrollbar_adjustment->page_size=(gfloat) (user_data->dlg.dialog_graph.max_interval/100);
-	} else {
-		user_data->dlg.dialog_graph.scrollbar_adjustment->page_size=(gfloat) (last_interval-first_interval);
-	}
-	user_data->dlg.dialog_graph.scrollbar_adjustment->value=last_interval-user_data->dlg.dialog_graph.scrollbar_adjustment->page_size;
-#endif
 	gtk_adjustment_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
 	gtk_adjustment_value_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
 
@@ -1385,11 +1375,7 @@ static void scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 	user_data_t *user_data = data;
 	guint32 mi;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
-#else
-	mi=(guint32) (user_data->dlg.dialog_graph.scrollbar_adjustment->value+user_data->dlg.dialog_graph.scrollbar_adjustment->page_size);
-#endif
 	if(user_data->dlg.dialog_graph.last_interval==mi){
 		return;
 	}
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 14c762494d..0a7005d16e 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -60,6 +60,7 @@
 #include "gtk/main.h"
 #include "gtk/filter_autocomplete.h"
 
+#include "gtk/old-gtk-compat.h"
 
 #define MAX_GRAPHS 5
 
@@ -1128,7 +1129,6 @@ io_stat_draw(io_stat_t *io)
 
 
 	/* update the scrollbar */
-#if GTK_CHECK_VERSION(2,14,0)
 	if (io->max_interval == 0) {
 		gtk_adjustment_set_upper(io->scrollbar_adjustment, (gfloat) io->interval);
 		gtk_adjustment_set_step_increment(io->scrollbar_adjustment, (gfloat) (io->interval/10));
@@ -1140,19 +1140,6 @@ io_stat_draw(io_stat_t *io)
 	}
 	gtk_adjustment_set_page_size(io->scrollbar_adjustment, gtk_adjustment_get_page_increment(io->scrollbar_adjustment));
 	gtk_adjustment_set_value(io->scrollbar_adjustment, (gfloat)first_interval);
-#else
-	if (io->max_interval == 0) {
-		io->scrollbar_adjustment->upper=(gfloat) io->interval;
-		io->scrollbar_adjustment->step_increment=(gfloat) (io->interval/10);
-		io->scrollbar_adjustment->page_increment=(gfloat) io->interval;
-	} else {
-		io->scrollbar_adjustment->upper=(gfloat) io->max_interval;
-		io->scrollbar_adjustment->step_increment=(gfloat) ((last_interval-first_interval)/10);
-		io->scrollbar_adjustment->page_increment=(gfloat) (last_interval-first_interval);
-	}
-	io->scrollbar_adjustment->page_size=io->scrollbar_adjustment->page_increment;
-	io->scrollbar_adjustment->value=(gfloat)first_interval;
-#endif
 	gtk_adjustment_changed(io->scrollbar_adjustment);
 	gtk_adjustment_value_changed(io->scrollbar_adjustment);
 
@@ -1432,11 +1419,7 @@ scrollbar_changed(GtkWidget *widget _U_, gpointer user_data)
 	io_stat_t *io = user_data;
 	guint32 mi;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	mi=(guint32) (gtk_adjustment_get_value(io->scrollbar_adjustment) + gtk_adjustment_get_page_size(io->scrollbar_adjustment));
-#else
-	mi=(guint32) (io->scrollbar_adjustment->value+io->scrollbar_adjustment->page_size);
-#endif
 	if(io->last_interval==mi){
 		return;
 	}
diff --git a/gtk/main.c b/gtk/main.c
index 260ddf134e..ad5297eb45 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -161,6 +161,8 @@
 #include "gtk/proto_help.h"
 #include "gtk/new_packet_list.h"
 
+#include "gtk/old-gtk-compat.h"
+
 #ifdef HAVE_LIBPCAP
 #include "../image/wsicon16.xpm"
 #include "../image/wsicon32.xpm"
@@ -1343,17 +1345,10 @@ resolv_update_cb(gpointer data _U_)
 {
   /* Anything new show up? */
   if (host_name_lookup_process(NULL)) {
-#if GTK_CHECK_VERSION(2,14,0)
     if (gtk_widget_get_window(pkt_scrollw))
 	gdk_window_invalidate_rect(gtk_widget_get_window(pkt_scrollw), NULL, TRUE);
     if (gtk_widget_get_window(tv_scrollw))
 	gdk_window_invalidate_rect(gtk_widget_get_window(tv_scrollw), NULL, TRUE);
-#else
-    if (pkt_scrollw->window)
-	gdk_window_invalidate_rect(pkt_scrollw->window, NULL, TRUE);
-    if (tv_scrollw->window)
-	gdk_window_invalidate_rect(tv_scrollw->window, NULL, TRUE);
-#endif
   }
 
   /* Always check. Even if we don't do async lookups we could still get
@@ -3685,11 +3680,7 @@ show_main_window(gboolean doing_work)
   display_queued_messages();
 
   /* Move the main window to the front, in case it isn't already there */
-#if GTK_CHECK_VERSION(2,14,0)
   gdk_window_raise(gtk_widget_get_window(top_level));
-#else
-  gdk_window_raise(top_level->window);
-#endif
 
 #ifdef HAVE_AIRPCAP
   airpcap_toolbar_show(airpcap_tb);
diff --git a/gtk/new_packet_list.c b/gtk/new_packet_list.c
index 45c1b21a9c..986f88d7cc 100644
--- a/gtk/new_packet_list.c
+++ b/gtk/new_packet_list.c
@@ -68,6 +68,8 @@
 #include "gtk/filter_dlg.h"
 #include "gtk/filter_autocomplete.h"
 
+#include "gtk/old-gtk-compat.h"
+
 #define COLUMN_WIDTH_MIN 40
 
 #define COL_EDIT_COLUMN          "column"
@@ -1108,19 +1110,11 @@ new_packet_list_check_end(void)
 	adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(packetlist->view));
 	g_return_val_if_fail(adj != NULL, FALSE);
 
-#if GTK_CHECK_VERSION(2,14,0)
 	if (gtk_adjustment_get_value(adj) >= gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj)) {
-#else
-	if (adj->value >= adj->upper - adj->page_size) {
-#endif
 		at_end = TRUE;
 	}
 #ifdef HAVE_LIBPCAP
-#if GTK_CHECK_VERSION(2,14,0)
 	if (gtk_adjustment_get_value(adj) > 0 && at_end != last_at_end && at_end != auto_scroll_live) {
-#else
-	if (adj->value > 0 && at_end != last_at_end && at_end != auto_scroll_live) {
-#endif
 		menu_auto_scroll_live_changed(at_end);
 	}
 #endif
diff --git a/gtk/old-gtk-compat.h b/gtk/old-gtk-compat.h
new file mode 100644
index 0000000000..a79f472a1a
--- /dev/null
+++ b/gtk/old-gtk-compat.h
@@ -0,0 +1,42 @@
+/* 
+ * Definitions to provide some functions that are not present in older
+ * GTK versions (down to 2.12.0)
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef OLD_GTK_COMPAT_H
+#define OLD_GTK_COMPAT_H
+
+#if !GTK_CHECK_VERSION (2, 14, 0)
+#	define gtk_widget_get_window(widget) (widget)->window
+#	define gtk_color_selection_dialog_get_color_selection(dialog) (dialog)->colorsel
+#	define gtk_selection_data_get_length(seldata) (seldata)->length
+#	define gtk_selection_data_get_data(seldata) (seldata)->data
+#	define gtk_adjustment_set_upper(adj, val) (adj)->upper = val
+#	define gtk_adjustment_set_step_increment(adj, val) (adj)->step_increment = val
+#	define gtk_adjustment_set_page_increment(adj, val) (adj)->page_increment = val
+#	define gtk_adjustment_get_page_increment(adj) (adj)->page_increment
+#	define gtk_adjustment_set_page_size(adj, val) (adj)->page_size = val
+#	define gtk_adjustment_get_page_size(adj) (adj)->page_size
+#endif
+
+#endif
diff --git a/gtk/pixmap_save.c b/gtk/pixmap_save.c
index d6965eac59..de73edfa5c 100644
--- a/gtk/pixmap_save.c
+++ b/gtk/pixmap_save.c
@@ -39,6 +39,7 @@
 #include "gtk/gui_utils.h"
 #include "gtk/file_dlg.h"
 
+#include "gtk/old-gtk-compat.h"
 
 static GtkWidget *save_as_w;
 
@@ -170,11 +171,7 @@ pixmap_save_cb(GtkWidget *w, gpointer pixmap_ptr _U_)
 	gtk_widget_show(save_as_w);
 	window_present(save_as_w);
 	parent = gtk_widget_get_parent_window(w);
-#if GTK_CHECK_VERSION(2,14,0)
 	gdk_window_set_transient_for(gtk_widget_get_window(save_as_w), parent);
-#else
-	gdk_window_set_transient_for(save_as_w->window, parent);
-#endif
 
 #if 0
 	if(gtk_dialog_run(GTK_DIALOG(save_as_w)) == GTK_RESPONSE_ACCEPT)
diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index e93fb2c357..5ad092fb35 100644
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -91,6 +91,8 @@
 #include "gtk/rtp_player.h"
 #endif /* HAVE_LIBPORTAUDIO */
 
+#include "gtk/old-gtk-compat.h"
+
 enum
 {
 	PACKET_COLUMN,
@@ -1400,11 +1402,7 @@ static gint scrollbar_changed(GtkWidget *widget _U_, gpointer data)
 	user_data_t *user_data=(user_data_t *)data;
 	guint32 mi;
 
-#if GTK_CHECK_VERSION(2,14,0)
 	mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
-#else
-	mi=(guint32) (user_data->dlg.dialog_graph.scrollbar_adjustment->value+user_data->dlg.dialog_graph.scrollbar_adjustment->page_size);
-#endif
 	if(user_data->dlg.dialog_graph.last_interval==mi){
 		return TRUE;
 	}
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index dbd7dd4fae..3b40a40382 100644
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -83,6 +83,7 @@
 #include "gtk/rtp_player.h"
 #include "gtk/stock_icons.h"
 
+#include "gtk/old-gtk-compat.h"
 
 /*define this symbol to compile with G729 and G723 codecs*/
 /*#define HAVE_G729_G723 1*/
@@ -1016,7 +1017,6 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
 		}
 	}
 #endif
-#if GTK_CHECK_VERSION(2,14,0)
 	if (!rci->cursor_catch) {
 		if (idx/MULT < gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)/2) {
 			gtk_adjustment_set_value(rci->h_scrollbar_adjustment, gtk_adjustment_get_lower(rci->h_scrollbar_adjustment));
@@ -1035,27 +1035,6 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
 			gtk_adjustment_value_changed(rci->h_scrollbar_adjustment);
 		}
 	}
-#else
-	if (!rci->cursor_catch) {
-		if (idx/MULT < rci->h_scrollbar_adjustment->page_size/2) {
-			rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->lower;
-		} else if (idx/MULT > (rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size/2)) {
-			rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->upper - rci->h_scrollbar_adjustment->page_size;
-		} else {
-			rci->h_scrollbar_adjustment->value = idx/MULT - rci->h_scrollbar_adjustment->page_size/2;
-		}
-
-		gtk_adjustment_value_changed(rci->h_scrollbar_adjustment);
-	} else if ( (rci->cursor_prev/MULT < (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) &&
-		(idx/MULT >= (rci->h_scrollbar_adjustment->value+rci->h_scrollbar_adjustment->page_increment)) ){
-		rci->cursor_catch = FALSE;
-		for (i=1; i<10; i++) {
-			rci->h_scrollbar_adjustment->value = MIN(rci->h_scrollbar_adjustment->upper-rci->h_scrollbar_adjustment->page_size, rci->h_scrollbar_adjustment->value + (rci->h_scrollbar_adjustment->page_size/20));
-			gtk_adjustment_value_changed(rci->h_scrollbar_adjustment);
-		}
-	}
-#endif
-
 
 	/* Connect back the "value" scroll signal */
 	g_signal_connect(rci->h_scrollbar_adjustment, "value_changed", G_CALLBACK(h_scrollbar_changed), rci);
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 200ef60c44..245fe914d4 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -45,6 +45,7 @@
 #include "gtk/tap_param_dlg.h"
 #include "gtk/main.h"
 
+#include "gtk/old-gtk-compat.h"
 
 /* used to keep track of the stats for a specific PDU type*/
 typedef struct _wsp_pdu_t {
@@ -416,7 +417,7 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_)
         window_present(sp->win);
 
         cf_retap_packets(&cfile);
-	gdk_window_raise(sp->win->window);
+	gdk_window_raise(gtk_widget_get_window(sp->win));
 }
 
 static tap_param wsp_stat_params[] = {