Fix some compiler errors with -DGTK_DISABLE_DEPRECATED

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

diff --git a/gtk/airpcap_dlg.c b/gtk/airpcap_dlg.c
index 6563be920684147b834986464d7bf16540a39ee7..0bd8378945fff27f58a3f605f9ace70e82c6a42e 100644 (file)
--- a/gtk/airpcap_dlg.c
+++ b/gtk/airpcap_dlg.c
@@ -1088,13 +1088,21 @@ on_add_new_key_bt_clicked(GtkWidget *button _U_, gpointer data)
     gtk_widget_set_name (ok_bt, "ok_bt");
     gtk_widget_show (ok_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (ok_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT);
+#endif
 
     cancel_bt = gtk_button_new_with_mnemonic ("Cancel");
     gtk_widget_set_name (cancel_bt, "cancel_bt");
     gtk_widget_show (cancel_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (cancel_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT);
+#endif
 
     add_frame_lb = gtk_label_new ("<b>Modify Selected Key</b>");
     gtk_widget_set_name (add_frame_lb, "add_frame_lb");
@@ -1326,13 +1334,21 @@ on_edit_key_bt_clicked(GtkWidget *button _U_, gpointer data)
     gtk_widget_set_name (ok_bt, "ok_bt");
     gtk_widget_show (ok_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (ok_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT);
+#endif
 
     cancel_bt = gtk_button_new_with_mnemonic ("Cancel");
     gtk_widget_set_name (cancel_bt, "cancel_bt");
     gtk_widget_show (cancel_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (cancel_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT);
+#endif
 
     edit_frame_lb = gtk_label_new ("<b>Modify Selected Key</b>");
     gtk_widget_set_name (edit_frame_lb, "edit_frame_lb");
@@ -2273,31 +2289,51 @@ display_airpcap_key_management_cb(GtkWidget *w _U_, gpointer data)
     gtk_widget_set_name (add_new_key_bt, "add_new_key_bt");
     gtk_widget_show (add_new_key_bt);
     gtk_container_add (GTK_CONTAINER (key_v_button_box), add_new_key_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (add_new_key_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (add_new_key_bt, GTK_CAN_DEFAULT);
+#endif
 
     edit_key_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT);
     gtk_widget_set_name (edit_key_bt, "edit_key_bt");
     gtk_widget_show (edit_key_bt);
     gtk_container_add (GTK_CONTAINER (key_v_button_box), edit_key_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (edit_key_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (edit_key_bt, GTK_CAN_DEFAULT);
+#endif
 
     remove_key_bt = gtk_button_new_from_stock(GTK_STOCK_DELETE);
     gtk_widget_set_name (remove_key_bt, "remove_key_bt");
     gtk_widget_show (remove_key_bt);
     gtk_container_add (GTK_CONTAINER (key_v_button_box), remove_key_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (remove_key_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (remove_key_bt, GTK_CAN_DEFAULT);
+#endif
 
     move_key_up_bt = gtk_button_new_from_stock(GTK_STOCK_GO_UP);
     gtk_widget_set_name (move_key_up_bt, "move_key_up_bt");
     gtk_widget_show (move_key_up_bt);
     gtk_container_add (GTK_CONTAINER (key_v_button_box), move_key_up_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (move_key_up_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (move_key_up_bt, GTK_CAN_DEFAULT);
+#endif
 
     move_key_down_bt = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
     gtk_widget_set_name (move_key_down_bt, "move_key_down_bt");
     gtk_widget_show (move_key_down_bt);
     gtk_container_add (GTK_CONTAINER (key_v_button_box), move_key_down_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (move_key_down_bt, GTK_CAN_DEFAULT);
+#else
     GTK_WIDGET_SET_FLAGS (move_key_down_bt, GTK_CAN_DEFAULT);
+#endif
 
     keys_frame_lb = gtk_label_new ("<b>Decryption Keys</b>");
     gtk_widget_set_name (keys_frame_lb, "keys_frame_lb");
@@ -2820,13 +2856,21 @@ airpcap_keys_check_w(GtkWidget *w, gpointer data _U_)
     gtk_widget_set_name (ok_bt, "ok_bt");
     gtk_widget_show (ok_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), ok_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (ok_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (ok_bt, GTK_CAN_DEFAULT);
+#endif
 
     cancel_bt = gtk_button_new_with_mnemonic ("Cancel");
     gtk_widget_set_name (cancel_bt, "cancel_bt");
     gtk_widget_show (cancel_bt);
     gtk_container_add (GTK_CONTAINER (low_h_button_box), cancel_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default (cancel_bt, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS (cancel_bt, GTK_CAN_DEFAULT);
+#endif
 
     /* Store pointers to all widgets, for use by lookup_widget(). */
     g_signal_connect (ok_bt, "clicked", G_CALLBACK(on_keys_check_ok_bt_clicked), keys_check_w);

diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c
index 926eea50839a4d81bf5d8fbefb7473c806818112..54363f6ce34094a59bf4ca4070539bffaf24723c 100644 (file)
--- a/gtk/flow_graph.c
+++ b/gtk/flow_graph.c
@@ -609,7 +609,11 @@ flow_graph_dlg_create (void)
 
        bt_cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_cancel);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_cancel, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_cancel, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text (bt_cancel, "Cancel this dialog");
        window_set_cancel_button(flow_graph_dlg_w, bt_cancel, window_cancel_button_cb);
 

diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index e04932267b2ae74ee86def3a208a66b382ada801..a7729867a21e5b94a18f9877105ce44ddec273ad 100644 (file)
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -195,7 +195,11 @@ static funnel_text_window_t* new_text_window(const gchar* title) {
        gtk_box_pack_start(GTK_BOX(main_vb), hbox, FALSE, FALSE, 0);
 
        tw->bt_close = gtk_button_new_with_label("Close");
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(tw->bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(tw->bt_close, GTK_CAN_DEFAULT);
+#endif
        g_object_set_data(G_OBJECT(hbox), "Close", tw->bt_close);
 
        gtk_box_pack_end(GTK_BOX(hbox), tw->bt_close, FALSE, FALSE, 0);
@@ -353,7 +357,11 @@ static void text_window_add_button(funnel_text_window_t*  tw, funnel_bt_t* cbd,
        g_ptr_array_add(tw->buttons,cbd);
 
        button = gtk_button_new_with_label(label);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(button, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#endif
 
        gtk_box_pack_start(GTK_BOX(tw->button_hbox), button, FALSE, FALSE, 0);
 

diff --git a/gtk/gtkvumeter.c b/gtk/gtkvumeter.c
index e1445fbac0789630ffbe05045db490c592a7805f..abbc3f18bc7bd14fe038891ce9e9ce4f853fb850 100644 (file)
--- a/gtk/gtkvumeter.c
+++ b/gtk/gtkvumeter.c
@@ -51,7 +51,7 @@ static GtkWidgetClass *parent_class = NULL;
 GType gtk_vumeter_get_type (void)
 {
     static GType vumeter_type = 0;
-    
+
     if (!vumeter_type) {
         static const GTypeInfo vumeter_info = {
             sizeof (GtkVUMeterClass),
@@ -109,7 +109,7 @@ static void gtk_vumeter_init (GtkVUMeter *vumeter)
     vumeter->level = 0;
     vumeter->level_min = 0;
     vumeter->level_max = 32767;
-    
+
     vumeter->peak = FALSE;
     vumeter->peak_level = 0;
     vumeter->peak_timeout = 0;
@@ -129,11 +129,11 @@ static void gtk_vumeter_class_init (GtkVUMeterClass *class)
     parent_class = g_type_class_ref (gtk_widget_get_type ());
 
     object_class->destroy = gtk_vumeter_destroy;
-    
+
     widget_class->realize = gtk_vumeter_realize;
     widget_class->expose_event = gtk_vumeter_expose;
     widget_class->size_request = gtk_vumeter_size_request;
-    widget_class->size_allocate = gtk_vumeter_size_allocate;    
+    widget_class->size_allocate = gtk_vumeter_size_allocate;
 }
 
 static void gtk_vumeter_destroy (GtkObject *object)
@@ -145,7 +145,7 @@ static void gtk_vumeter_destroy (GtkObject *object)
     }
 
     gtk_vumeter_free_colors (vumeter);
-    
+
     GTK_OBJECT_CLASS (parent_class)->destroy (object);
 }
 
@@ -155,7 +155,7 @@ static void gtk_vumeter_realize (GtkWidget *widget)
     GdkWindowAttr attributes;
     gint attributes_mask;
     GtkAllocation widget_alloc;
-    
+
     g_return_if_fail (widget != NULL);
     g_return_if_fail (GTK_IS_VUMETER (widget));
 
@@ -199,7 +199,7 @@ static void gtk_vumeter_realize (GtkWidget *widget)
     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 ();
     gtk_vumeter_setup_colors (vumeter);
@@ -282,7 +282,7 @@ static void gtk_vumeter_size_allocate (GtkWidget *widget, GtkAllocation *allocat
 {
     GtkVUMeter *vumeter;
     GtkRequisition requisition;
-    
+
     g_return_if_fail (GTK_IS_VUMETER (widget));
     g_return_if_fail (allocation != NULL);
 
@@ -327,7 +327,7 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
 #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);
 
@@ -349,12 +349,12 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
     height = widget_alloc.height - vumeter->padding_top - vumeter->padding_bottom;
 
     /* clear widget and draw border */
-    gtk_paint_box (gtk_widget_get_style(widget), widget_window, GTK_STATE_NORMAL, GTK_SHADOW_IN, 
+    gtk_paint_box (gtk_widget_get_style(widget), widget_window, GTK_STATE_NORMAL, GTK_SHADOW_IN,
         NULL, widget, "trough", 0, 0, widget_alloc.width, widget_alloc.height);
 
 #if 0
     /* clear bar only */
-    gtk_paint_box (widget->style, widget_window, GTK_STATE_NORMAL, GTK_SHADOW_NONE, 
+    gtk_paint_box (widget->style, widget_window, GTK_STATE_NORMAL, GTK_SHADOW_NONE,
         NULL, widget, "trough", vumeter->padding_left, vumeter->padding_top, width+1, height+1);
 #endif
 
@@ -366,7 +366,7 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
             h = vumeter->padding_top;
             inc = 1;
         }
-        
+
         /* draw scale */
         if(vumeter->scale_items != NULL) {
             /* iterate through scale items */
@@ -375,7 +375,7 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
                 int scale_level = gtk_vumeter_sound_level_to_draw_level (vumeter, item->level);
 
                 /* XXX - use a fixed color for the scale? */
-                gdk_draw_line (widget_window, vumeter->b_gc[scale_level], 
+                gdk_draw_line (widget_window, vumeter->b_gc[scale_level],
                     vumeter->padding_left+width, h + inc*scale_level,
                     vumeter->padding_left+width+(item->large==TRUE ? LARGE_PITCH_LINE : SMALL_PITCH_LINE)-1, h + inc*scale_level);
 
@@ -395,14 +395,14 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
 
         /* draw background gradient */
         for (index = 0; index < level; index++, h += inc) {
-            gdk_draw_line (widget_window, vumeter->b_gc[index], 
-                vumeter->padding_left+vumeter->reduced_thickness, h, 
+            gdk_draw_line (widget_window, vumeter->b_gc[index],
+                vumeter->padding_left+vumeter->reduced_thickness, h,
                 vumeter->padding_left+width-1-vumeter->reduced_thickness, h);
         }
         /* draw foreground gradient */
         for (index = level; index < height; index++, h += inc) {
-            gdk_draw_line (widget_window, vumeter->f_gc[index], 
-                vumeter->padding_left,h, 
+            gdk_draw_line (widget_window, vumeter->f_gc[index],
+                vumeter->padding_left,h,
                 vumeter->padding_left+width-1, h);
         }
         /* Draw the peak */
@@ -412,7 +412,7 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
             for (; index < MIN (peak_level + 1, height - 2); index++) {
                 h = vumeter->scale_inverted == TRUE ? height +vumeter->padding_top - (index + 2) : vumeter->padding_top + index + 1;
                 gdk_draw_line (widget_window, vumeter->f_gc[index], vumeter->padding_left, h, vumeter->padding_left+width-1, h);
-            }            
+            }
         }
     } else { /* Horizontal */
         /* the start point of the bar */
@@ -432,8 +432,8 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
                 int scale_level = gtk_vumeter_sound_level_to_draw_level (vumeter, item->level);
 
                 /* XXX - use a fixed color for the scale? */
-                gdk_draw_line (widget_window, vumeter->b_gc[scale_level], 
-                    w + inc*scale_level, vumeter->padding_top+height, 
+                gdk_draw_line (widget_window, vumeter->b_gc[scale_level],
+                    w + inc*scale_level, vumeter->padding_top+height,
                     w + inc*scale_level, vumeter->padding_top+height+(item->large==TRUE ? LARGE_PITCH_LINE : SMALL_PITCH_LINE)-1);
 
                 if(item->label) {
@@ -451,14 +451,14 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
 
         /* draw background gradient */
         for (index = 0; index < level; index++, w += inc) {
-            gdk_draw_line (widget_window, vumeter->b_gc[index], 
-                w, vumeter->padding_top+vumeter->reduced_thickness, 
+            gdk_draw_line (widget_window, vumeter->b_gc[index],
+                w, vumeter->padding_top+vumeter->reduced_thickness,
                 w, vumeter->padding_top+height-1-vumeter->reduced_thickness);
         }
         /* draw foreground gradient */
         for (index = level; index < width; index++, w+= inc) {
-            gdk_draw_line (widget_window, vumeter->f_gc[index], 
-                w, vumeter->padding_top, 
+            gdk_draw_line (widget_window, vumeter->f_gc[index],
+                w, vumeter->padding_top,
                 w, vumeter->padding_top+height-1);
         }
 
@@ -470,9 +470,9 @@ static gboolean gtk_vumeter_expose (GtkWidget *widget, GdkEventExpose *event)
             for (; index <= MIN (peak_level, width - 2); index++, w+= inc) {
                 gdk_draw_line (widget_window, vumeter->f_gc[index], w, vumeter->padding_top, w, vumeter->padding_top+height-1);
             }
-        }       
+        }
     }
-    
+
     return TRUE;
 }
 
@@ -484,11 +484,11 @@ static void gtk_vumeter_free_colors (GtkVUMeter *vumeter)
 
     /* Free old gc's */
     if (vumeter->f_gc && vumeter->b_gc) {
-        for (index = 0; index < vumeter->colors; index++) {    
+        for (index = 0; index < vumeter->colors; index++) {
             if (vumeter->f_gc[index]) {
                 g_object_unref (G_OBJECT(vumeter->f_gc[index]));
             }
-            if (vumeter->b_gc[index]) {        
+            if (vumeter->b_gc[index]) {
                 g_object_unref (G_OBJECT(vumeter->b_gc[index]));
             }
         }
@@ -497,7 +497,7 @@ static void gtk_vumeter_free_colors (GtkVUMeter *vumeter)
         vumeter->f_gc = NULL;
         vumeter->b_gc = NULL;
     }
-    
+
     /* Free old Colors */
     if (vumeter->f_colors) {
         gdk_colormap_free_colors (vumeter->colormap, vumeter->f_colors, vumeter->colors);
@@ -518,11 +518,11 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
     gint first, second;
     gint max = 0, min = 0, log_max = 0;
     GtkAllocation vumeter_alloc;
-    
+
     g_return_if_fail (vumeter->colormap != NULL);
-    
+
     gtk_vumeter_free_colors (vumeter);
-    
+
 #if GTK_CHECK_VERSION(2,18,0)
     gtk_widget_get_allocation(GTK_WIDGET(vumeter), &vumeter_alloc);
 #else
@@ -535,17 +535,17 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
     } else {
         vumeter->colors = MAX(vumeter_alloc.width - vumeter->padding_left - vumeter->padding_right, 0);
     }
-    
+
     /* allocate new memory */
     vumeter->f_colors = g_malloc (vumeter->colors * sizeof(GdkColor));
-    vumeter->b_colors = g_malloc (vumeter->colors * sizeof(GdkColor));    
+    vumeter->b_colors = g_malloc (vumeter->colors * sizeof(GdkColor));
     vumeter->f_gc = g_malloc (vumeter->colors * sizeof(GdkGC *));
-    vumeter->b_gc = g_malloc (vumeter->colors * sizeof(GdkGC *));    
+    vumeter->b_gc = g_malloc (vumeter->colors * sizeof(GdkGC *));
 
     /* Initialize stuff */
     if (vumeter->scaling == GTK_VUMETER_SCALING_LINEAR) {
         first = 1+gtk_vumeter_sound_level_to_draw_level (vumeter, vumeter->yellow_level);
-        second = vumeter->colors;      
+        second = vumeter->colors;
     } else {
         max = vumeter->level_max;
         min = vumeter->level_min;
@@ -588,7 +588,7 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
                 /* background */
                 vumeter->b_colors[index].red = vumeter->b_colors[index - 1].red;
                 vumeter->b_colors[index].green = vumeter->b_colors[index - 1].green - b_step;
-                vumeter->b_colors[index].blue = 0;     
+                vumeter->b_colors[index].blue = 0;
             }
         }
     } else {
@@ -613,9 +613,9 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
             vumeter->b_colors[index].green = vumeter->b_colors[index - 1].green + b_step;
             vumeter->b_colors[index].blue = 0;
         }
-        /* Allocate from Yellow to Green */    
+        /* Allocate from Yellow to Green */
         f_step = vumeter->f_brightness / MAX(second - first, 1);
-        b_step = vumeter->b_brightness / MAX(second - first, 1);        
+        b_step = vumeter->b_brightness / MAX(second - first, 1);
         for (index = first; index < second; index++) {
             /* foreground */
             vumeter->f_colors[index].red = vumeter->f_colors[index - 1].red - f_step;
@@ -624,12 +624,12 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
             /* background */
             vumeter->b_colors[index].red = vumeter->b_colors[index - 1].red - b_step;
             vumeter->b_colors[index].green = vumeter->b_colors[index - 1].green;
-            vumeter->b_colors[index].blue = 0;     
+            vumeter->b_colors[index].blue = 0;
         }
         if (vumeter->scaling == GTK_VUMETER_SCALING_LOG && (vumeter->colors - second) > 0) {
             /* Allocate from Green to Dark Green */
             f_step = vumeter->f_brightness / 2 / (vumeter->colors - second);
-            b_step = vumeter->b_brightness / 2 / (vumeter->colors - second);     
+            b_step = vumeter->b_brightness / 2 / (vumeter->colors - second);
             for (index = second; index < vumeter->colors; index++) {
                 /* foreground */
                 vumeter->f_colors[index].red = 0;
@@ -638,7 +638,7 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *vumeter)
                 /* background */
                 vumeter->b_colors[index].red = 0;
                 vumeter->b_colors[index].green = vumeter->b_colors[index - 1].green - b_step;
-                vumeter->b_colors[index].blue = 0;      
+                vumeter->b_colors[index].blue = 0;
             }
         }
     } /* colors_inverted */
@@ -660,7 +660,7 @@ static void gtk_vumeter_setup_colors (GtkVUMeter *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]);        
+        gdk_gc_set_foreground(vumeter->b_gc[index], &vumeter->b_colors[index]);
     }
 }
 
@@ -669,12 +669,12 @@ static gint gtk_vumeter_sound_level_to_draw_level (GtkVUMeter *vumeter, gint sou
     gdouble draw_level;
     gdouble level, min, max, height;
     gdouble log_level, log_max;
-    
+
     level = (gdouble)sound_level;
     min = (gdouble)vumeter->level_min;
     max = (gdouble)vumeter->level_max;
     height = (gdouble)vumeter->colors;
-    
+
     if (vumeter->scaling == GTK_VUMETER_SCALING_LINEAR) {
         draw_level = (1.0 - (level - min)/(max - min)) * (height - 1.0);
         /* to avoid rounding problems */
@@ -684,7 +684,7 @@ static gint gtk_vumeter_sound_level_to_draw_level (GtkVUMeter *vumeter, gint sou
         log_max = log10(1/(max - min + 1));
         draw_level = log_level/log_max * (height - 1.0);
     }
-    
+
     return ((gint)draw_level);
 }
 
@@ -699,7 +699,7 @@ static gboolean gtk_vumeter_redraw_timeout (gpointer data)
 #endif
     if (vumeter->peak == FALSE) { return TRUE; }
     if (vumeter->peak_level == vumeter->level) { return TRUE; }
-    
+
     if(vumeter->peak_hold != 0) {
         vumeter->peak_hold--;
         return TRUE;
@@ -708,9 +708,9 @@ static gboolean gtk_vumeter_redraw_timeout (gpointer data)
     /* Drop the peak_level by rate */
     vumeter->peak_level -= vumeter->peak_falloff_rate;
     vumeter->peak_level = MAX (vumeter->peak_level, vumeter->level);
-    
+
     gtk_widget_queue_draw (GTK_WIDGET(vumeter));
-    
+
     return TRUE;
 }
 
@@ -740,7 +740,7 @@ static void gtk_vumeter_setup_scale_items(GtkVUMeter *vumeter, GList *scale_item
 
     /* clone the whole list */
     new_list = gtk_vumeter_clone_scale_items(scale_items);
-    
+
     /* clamp the levels */
     for (new_list_item = new_list; new_list_item != NULL; new_list_item = g_list_next(new_list_item)) {
         GtkVUMeterScaleItem * item = new_list_item->data;
@@ -755,7 +755,7 @@ static void gtk_vumeter_setup_scale_items(GtkVUMeter *vumeter, GList *scale_item
 void gtk_vumeter_free_scale_items(GList *scale_items)
 {
     GList * current;
-    
+
     if(scale_items == NULL) return;
 
     for (current = scale_items; current != NULL; current = g_list_next(current)) {
@@ -795,7 +795,7 @@ void gtk_vumeter_set_orientation (GtkVUMeter *vumeter, GtkVUMeterOrientation ori
     if (GTK_WIDGET_REALIZED (vumeter)) {
 #endif
         gtk_widget_queue_draw (GTK_WIDGET (vumeter));
-    }            
+    }
 }
 
 /**
@@ -883,7 +883,7 @@ void gtk_vumeter_set_thickness_reduction (GtkVUMeter *vumeter, gint reduced_thic
         vumeter->reduced_thickness = reduced_thickness;
         vumeter->reduced_thickness = CLAMP(vumeter->reduced_thickness, 0, vumeter->thickness/2);
         gtk_widget_queue_resize (GTK_WIDGET (vumeter));
-    }      
+    }
 }
 
 /**
@@ -925,7 +925,7 @@ void gtk_vumeter_set_min_max (GtkVUMeter *vumeter, gint *min, gint *max)
 
     /* Allow min or max to be NULL */
     mi = (min != NULL) ? *min : vumeter->level_min;
-    ma = (max != NULL) ? *max : vumeter->level_max;    
+    ma = (max != NULL) ? *max : vumeter->level_max;
 
     /* Ensure that max > min */
     vumeter->level_max = MAX(ma, mi);
@@ -938,7 +938,7 @@ void gtk_vumeter_set_min_max (GtkVUMeter *vumeter, gint *min, gint *max)
     vumeter->level = CLAMP (vumeter->level, vumeter->level_min, vumeter->level_max);
     vumeter->peak_level = CLAMP (vumeter->peak_level, vumeter->level, vumeter->level_max);
     vumeter->yellow_level = CLAMP (vumeter->yellow_level, vumeter->level_min, vumeter->level_max);
-    
+
     gtk_widget_queue_draw (GTK_WIDGET(vumeter));
 }
 
@@ -981,7 +981,7 @@ void gtk_vumeter_set_level (GtkVUMeter *vumeter, gint level)
             vumeter->peak_level = vumeter->level;
         }
         gtk_widget_queue_draw (GTK_WIDGET(vumeter));
-    }        
+    }
 }
 
 /**
@@ -1012,7 +1012,7 @@ gint gtk_vumeter_get_level (GtkVUMeter *vumeter)
  */
 void gtk_vumeter_set_scaling (GtkVUMeter *vumeter, GtkVUMeterScaling scaling)
 {
-    g_return_if_fail (GTK_IS_VUMETER (vumeter));  
+    g_return_if_fail (GTK_IS_VUMETER (vumeter));
 
     if (scaling != vumeter->scaling) {
         vumeter->scaling = CLAMP (scaling, GTK_VUMETER_SCALING_LINEAR, GTK_VUMETER_SCALING_LOG);
@@ -1023,7 +1023,7 @@ void gtk_vumeter_set_scaling (GtkVUMeter *vumeter, GtkVUMeterScaling scaling)
 #endif
             gtk_vumeter_setup_colors (vumeter);
             gtk_widget_queue_draw (GTK_WIDGET (vumeter));
-        }            
+        }
     }
 }
 
@@ -1057,7 +1057,7 @@ GtkVUMeterScaling gtk_vumeter_get_scaling (GtkVUMeter *vumeter)
  */
 void gtk_vumeter_set_scale_items(GtkVUMeter *vumeter, GList *scale_items)
 {
-    g_return_if_fail (GTK_IS_VUMETER (vumeter));  
+    g_return_if_fail (GTK_IS_VUMETER (vumeter));
 
     gtk_vumeter_setup_scale_items(vumeter, scale_items);
 
@@ -1102,7 +1102,7 @@ void gtk_vumeter_set_scale_hole_size (GtkVUMeter *vumeter, gint hole_size)
     if (vumeter->scale_pitch_holes != hole_size) {
         vumeter->scale_pitch_holes = hole_size;
         gtk_widget_queue_resize (GTK_WIDGET (vumeter));
-    }      
+    }
 }
 
 /**
@@ -1150,7 +1150,7 @@ void gtk_vumeter_set_peak (GtkVUMeter *vumeter, gboolean peak, guint redraw_rate
 
     if(redraw_rate != 0 && vumeter->peak) {
         vumeter->peak_timeout = g_timeout_add (redraw_rate, gtk_vumeter_redraw_timeout, vumeter);
-    }    
+    }
 }
 
 /**
@@ -1211,9 +1211,9 @@ gint gtk_vumeter_get_peak_hold_factor (GtkVUMeter *vumeter)
  * @param user_rate pixels to reduce the peak level at each redraw_rate in GTK_VUMETER_PEAK_FALLOFF_USER mode, otherwise ignored
  *
  * Set the numbers of pixel reduced from the peak indicator each redraw_rate (after the hold period is over).
- * The peak_falloff will be around: SLOW:5%, MEDIUM:10%, FAST:20%, USER:user_rate 
+ * The peak_falloff will be around: SLOW:5%, MEDIUM:10%, FAST:20%, USER:user_rate
  * of the current range, reduced from peak at each redraw_rate (%gtk_vumeter_set_peak()).
- * 
+ *
  * Hint: a user_rate of 0 can be used to hold the peak indicator at the highest position ever.
  */
 void gtk_vumeter_set_peak_falloff (GtkVUMeter *vumeter, GtkVUMeterPeakFalloff peak_falloff, guint user_rate)
@@ -1273,7 +1273,7 @@ void gtk_vumeter_get_peak_falloff (GtkVUMeter *vumeter, GtkVUMeterPeakFalloff *p
  */
 void gtk_vumeter_set_colors_inverted (GtkVUMeter *vumeter, gboolean inverted)
 {
-    g_return_if_fail (GTK_IS_VUMETER (vumeter));  
+    g_return_if_fail (GTK_IS_VUMETER (vumeter));
 
     vumeter->colors_inverted = inverted;
 #if GTK_CHECK_VERSION(2,20,0)
@@ -1283,7 +1283,7 @@ void gtk_vumeter_set_colors_inverted (GtkVUMeter *vumeter, gboolean inverted)
 #endif
         gtk_vumeter_setup_colors (vumeter);
         gtk_widget_queue_draw (GTK_WIDGET (vumeter));
-    }            
+    }
 }
 
 /**
@@ -1309,7 +1309,7 @@ gboolean gtk_vumeter_get_colors_inverted (GtkVUMeter *vumeter)
  */
 void gtk_vumeter_set_yellow_level (GtkVUMeter *vumeter, gint yellow_level)
 {
-    g_return_if_fail (GTK_IS_VUMETER (vumeter));  
+    g_return_if_fail (GTK_IS_VUMETER (vumeter));
 
     vumeter->yellow_level = CLAMP (yellow_level, vumeter->level_min, vumeter->level_max);
 #if GTK_CHECK_VERSION(2,20,0)
@@ -1319,7 +1319,7 @@ void gtk_vumeter_set_yellow_level (GtkVUMeter *vumeter, gint yellow_level)
 #endif
         gtk_vumeter_setup_colors (vumeter);
         gtk_widget_queue_draw (GTK_WIDGET (vumeter));
-    }            
+    }
 }
 
 /**
@@ -1355,7 +1355,7 @@ void gtk_vumeter_set_brightness (GtkVUMeter *vumeter, gint foreground, gint back
 #endif
         gtk_vumeter_setup_colors (vumeter);
         gtk_widget_queue_draw (GTK_WIDGET (vumeter));
-    }            
+    }
 }
 
 /**

diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c
index a035de01f5cae40d4eeacc1efbd28e6b06a1dd40..24ad44d91de2c8a16ac97d862b5025b0986f703c 100644 (file)
--- a/gtk/iax2_analysis.c
+++ b/gtk/iax2_analysis.c
@@ -787,7 +787,7 @@ static void on_iax2_window_destroy(GtkWidget *win _U_, gpointer data)
 
 /****************************************************************************/
 static void on_notebook_switch_page(GtkNotebook *notebook _U_,
-                                   GtkNotebookPage *page _U_,
+                                   gpointer *page _U_,
                                    gint page_num,
                                    gpointer data)
 {
@@ -1271,7 +1271,11 @@ static void dialog_graph_draw(user_data_t* user_data)
 
 
        gdk_draw_pixmap(user_data->dlg.dialog_graph.draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       user_data->dlg.dialog_graph.draw_area->style->fg_gc[gtk_widget_get_state(user_data->dlg.dialog_graph.draw_area)],
+#else
                        user_data->dlg.dialog_graph.draw_area->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.dialog_graph.draw_area)],
+#endif
                        user_data->dlg.dialog_graph.pixmap,
                        0, 0,
                        0, 0,
@@ -1315,7 +1319,11 @@ static gboolean draw_area_expose_event(GtkWidget *widget, GdkEventExpose *event,
        user_data_t *user_data = data;
 
        gdk_draw_pixmap(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        user_data->dlg.dialog_graph.pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,
@@ -3246,7 +3254,11 @@ static void create_iax2_dialog(user_data_t* user_data)
 
        close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add(GTK_CONTAINER(box4), close_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(close_bt, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_show(close_bt);
        window_set_cancel_button(window, close_bt, window_cancel_button_cb);
 

diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index e96cd0e06f25cff58da2bb685341b1a6082fbdbe..9d16c7045ba87d391bbd2fe1fb50f95ab0cb3b40 100644 (file)
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -1116,7 +1116,11 @@ io_stat_draw(io_stat_t *io)
 
 
        gdk_draw_pixmap(io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       io->draw_area->style->fg_gc[gtk_widget_get_state(io->draw_area)],
+#else
                        io->draw_area->style->fg_gc[GTK_WIDGET_STATE(io->draw_area)],
+#endif
                        io->pixmap,
                        0, 0,
                        0, 0,
@@ -1436,7 +1440,11 @@ draw_area_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_d
        io_stat_t *io = user_data;
 
        gdk_draw_pixmap(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        io->pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,

diff --git a/gtk/mcast_stream_dlg.c b/gtk/mcast_stream_dlg.c
index 736bfc2c4b92bfd68b7de86247c0546209e3fecb..95bad12ade9d52b8ad8e01d1f26a9a1e0936e04d 100644 (file)
--- a/gtk/mcast_stream_dlg.c
+++ b/gtk/mcast_stream_dlg.c
@@ -336,7 +336,11 @@ mcast_on_params(GtkButton *button _U_, gpointer data _U_)
        gtk_container_add (GTK_CONTAINER(hbuttonbox), ok_bt);
        cancel_bt = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
        gtk_container_add (GTK_CONTAINER(hbuttonbox), cancel_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(cancel_bt, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(cancel_bt, GTK_CAN_DEFAULT);
+#endif
        gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END);
        gtk_box_set_spacing(GTK_BOX(hbuttonbox), 0);
 
@@ -696,7 +700,11 @@ mcaststream_dlg_create(void)
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
        gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
 
        /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(mcaststream_on_unselect), NULL);*/
        g_signal_connect(bt_params, "clicked", G_CALLBACK(mcast_on_params), NULL);

diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c
index dee0b953725eba1977aef5cebeb861e9c7662443..be84e6fb999d03faf800affedf413dd908713134 100644 (file)
--- a/gtk/rtp_analysis.c
+++ b/gtk/rtp_analysis.c
@@ -793,7 +793,7 @@ static void on_destroy(GtkWidget *win _U_, user_data_t *user_data)
 
 /****************************************************************************/
 static void on_notebook_switch_page(GtkNotebook *notebook _U_,
-                                   GtkNotebookPage *page _U_,
+                                   gpointer *page _U_,
                                    gint page_num _U_,
                                    user_data_t *user_data _U_)
 {
@@ -1272,7 +1272,11 @@ static void dialog_graph_draw(user_data_t* user_data)
 
 
        gdk_draw_pixmap(user_data->dlg.dialog_graph.draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       user_data->dlg.dialog_graph.draw_area->style->fg_gc[gtk_widget_get_state(user_data->dlg.dialog_graph.draw_area)],
+#else
                        user_data->dlg.dialog_graph.draw_area->style->fg_gc[GTK_WIDGET_STATE(user_data->dlg.dialog_graph.draw_area)],
+#endif
                        user_data->dlg.dialog_graph.pixmap,
                        0, 0,
                        0, 0,
@@ -1319,7 +1323,11 @@ static gint expose_event(GtkWidget *widget, GdkEventExpose *event)
 
 
        gdk_draw_pixmap(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        user_data->dlg.dialog_graph.pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,
@@ -3401,7 +3409,11 @@ static void create_rtp_dialog(user_data_t* user_data)
 
        close_bt = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add(GTK_CONTAINER(box4), close_bt);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(close_bt, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(close_bt, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_show(close_bt);
        window_set_cancel_button(window, close_bt, window_cancel_button_cb);
 

diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c
index c9b768a0527c789cb23577497da7abc425bbe162..28fb21263e0e3a7f89a8465906aed20baf784886 100644 (file)
--- a/gtk/rtp_player.c
+++ b/gtk/rtp_player.c
@@ -968,7 +968,11 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
                gdk_draw_pixbuf(rci->pixmap, NULL, rci->cursor_pixbuf, 0, 0, (int) (rci->cursor_prev/MULT), 0, -1, -1, GDK_RGB_DITHER_NONE, 0 ,0);
 
                gdk_draw_drawable(rci->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       rci->draw_area->style->fg_gc[gtk_widget_get_state(rci->draw_area)],
+#else
                        rci->draw_area->style->fg_gc[GTK_WIDGET_STATE(rci->draw_area)],
+#endif
                        rci->pixmap,
                        (int) (rci->cursor_prev/MULT), 0,
                        (int) (rci->cursor_prev/MULT), 0,
@@ -988,7 +992,11 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
                        rci->draw_area->allocation.height-HEIGHT_TIME_LABEL);
 
                gdk_draw_drawable(rci->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       rci->draw_area->style->fg_gc[gtk_widget_get_state(rci->draw_area)],
+#else
                        rci->draw_area->style->fg_gc[GTK_WIDGET_STATE(rci->draw_area)],
+#endif
                        rci->pixmap,
                        (int) (idx/MULT), 0,
                        (int) (idx/MULT), 0,
@@ -1421,7 +1429,11 @@ static gboolean expose_event_channels(GtkWidget *widget, GdkEventExpose *event,
 
        if (GDK_IS_DRAWABLE(widget->window))
                gdk_draw_drawable(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        rci->pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,
@@ -1583,7 +1595,11 @@ add_channel_to_window(gchar *key _U_ , rtp_channel_info_t *rci, guint *counter _
        gtk_container_add(GTK_CONTAINER(rci->scroll_window), viewport);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
        gtk_widget_add_events (rci->draw_area, GDK_BUTTON_PRESS_MASK);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_focus(rci->draw_area, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(rci->draw_area, GTK_CAN_FOCUS);
+#endif
        gtk_widget_grab_focus(rci->draw_area);
 
        gtk_box_pack_start(GTK_BOX (channels_vb), rci->scroll_window, FALSE, FALSE, 0);
@@ -2187,7 +2203,11 @@ rtp_player_dlg_create(void)
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
        window_set_cancel_button(rtp_player_dlg_w, bt_close, window_cancel_button_cb);
 

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 0d5354a29d7ef0a53836b23321b4791d46749612..d206597124962fca648ca2b57fa6f2af0a022f59 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -1036,7 +1036,11 @@ rtpstream_dlg_create (void)
     bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
     gtk_container_add (GTK_CONTAINER (hbuttonbox), bt_close);
     gtk_widget_set_tooltip_text (bt_close, "Close this dialog");
+#if GTK_CHECK_VERSION(2,18,0)
+    gtk_widget_set_can_default(bt_close, TRUE);
+#else
     GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
 
     g_signal_connect(bt_unselect, "clicked", G_CALLBACK(rtpstream_on_unselect), NULL);
     g_signal_connect(bt_findrev, "clicked", G_CALLBACK(rtpstream_on_findrev), NULL);

diff --git a/gtk/sctp_byte_graph_dlg.c b/gtk/sctp_byte_graph_dlg.c
index 94ce4542cd2413d720265cb67d0de928d8666026..8baa34529285bfd48a56c5092859eed858a6dcbd 100644 (file)
--- a/gtk/sctp_byte_graph_dlg.c
+++ b/gtk/sctp_byte_graph_dlg.c
@@ -594,7 +594,11 @@ static void sctp_graph_redraw(struct sctp_udata *u_data)
        g_assert(ios != NULL);
 
        gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                        u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                        ios->pixmap,
                        0,0,
                        0, 0,
@@ -672,7 +676,11 @@ on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data _U_
        g_assert(ios != NULL);
 
        gdk_draw_pixmap(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        ios->pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,
@@ -822,7 +830,11 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
                g_assert(ios != NULL);
 
                gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                               u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                ios->pixmap,
                                0, 0,
                                0, 0,
@@ -883,7 +895,11 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
                g_assert(ios != NULL);
 
                gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                               u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                ios->pixmap,
                                0, 0,
                                0, 0,
@@ -1011,7 +1027,11 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
                        g_assert(ios != NULL);
 
                        gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                                   u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                    u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                    ios->pixmap,
                                    0, 0,
                                    0, 0,

diff --git a/gtk/sctp_graph_dlg.c b/gtk/sctp_graph_dlg.c
index 2013ef090462ecaeb11f4fff8eadebe8514b49a5..2373481e8602d6a709a18d2e96fabf40a757717d 100644 (file)
--- a/gtk/sctp_graph_dlg.c
+++ b/gtk/sctp_graph_dlg.c
@@ -910,7 +910,11 @@ sctp_graph_t *ios;
        g_assert(ios != NULL);
 
        gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                        u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                        ios->pixmap,
                        0,0,
                        0, 0,
@@ -994,7 +998,11 @@ expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data _U_)
        g_assert(ios != NULL);
 
        gdk_draw_pixmap(widget->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                       widget->style->fg_gc[gtk_widget_get_state(widget)],
+#else
                        widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
+#endif
                        ios->pixmap,
                        event->area.x, event->area.y,
                        event->area.x, event->area.y,
@@ -1147,7 +1155,11 @@ on_button_press_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer us
                g_assert(ios != NULL);
 
                gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                               u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                ios->pixmap,
                                0,0,
                                0, 0,
@@ -1208,7 +1220,11 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
                g_assert(ios != NULL);
 
                gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                               u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                ios->pixmap,
                                0, 0,
                                0, 0,
@@ -1362,7 +1378,11 @@ on_button_release_event (GtkWidget *widget _U_, GdkEventButton *event, gpointer
                        g_assert(ios != NULL);
 
                        gdk_draw_pixmap(u_data->io->draw_area->window,
+#if GTK_CHECK_VERSION(2,18,0)
+                                       u_data->io->draw_area->style->fg_gc[gtk_widget_get_state(u_data->io->draw_area)],
+#else
                                        u_data->io->draw_area->style->fg_gc[GTK_WIDGET_STATE(u_data->io->draw_area)],
+#endif
                                        ios->pixmap,
                                        0, 0,
                                        0, 0,

diff --git a/gtk/sctp_stat_dlg.c b/gtk/sctp_stat_dlg.c
index 90b96064b613709db8bbb76e3e53bbb39cd5af08..c2ed8973e96871231db7e0492905e4baf10f19f3 100644 (file)
--- a/gtk/sctp_stat_dlg.c
+++ b/gtk/sctp_stat_dlg.c
@@ -610,7 +610,11 @@ gtk_sctpstat_dlg(void)
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add (GTK_CONTAINER (hbuttonbox2), bt_close);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
        window_set_cancel_button( sctp_stat_dlg_w, bt_close, sctp_stat_on_close);
        gtk_widget_grab_focus(bt_close);
        gtk_widget_show (bt_close);

diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c
index d53347c74f853ca73fca17106c9b7bf394ea9eb2..3f11cf11cde0ec84a6a77d873686cada3752e79a 100644 (file)
--- a/gtk/voip_calls_dlg.c
+++ b/gtk/voip_calls_dlg.c
@@ -709,12 +709,20 @@ voip_calls_dlg_create(void)
 
        bt_select_all = gtk_button_new_from_stock(GTK_STOCK_SELECT_ALL);
        gtk_container_add(GTK_CONTAINER(hbuttonbox), bt_select_all);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_select_all, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_select_all, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text(bt_select_all, "Select all the calls");
 
        bt_close = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
        gtk_container_add(GTK_CONTAINER (hbuttonbox), bt_close);
+#if GTK_CHECK_VERSION(2,18,0)
+       gtk_widget_set_can_default(bt_close, TRUE);
+#else
        GTK_WIDGET_SET_FLAGS(bt_close, GTK_CAN_DEFAULT);
+#endif
        gtk_widget_set_tooltip_text(bt_close, "Close this dialog");
 
        /*g_signal_connect(bt_unselect, "clicked", G_CALLBACK(voip_calls_on_unselect), NULL);*/