Fix a typo and size_request.

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

diff --git a/gtk/filter_dlg.c b/gtk/filter_dlg.c
index 208a674f459cd3aec442c7cd4031eeacd9460544..562168a5457da09d868e1920b965d516c2106b81 100644 (file)
--- a/gtk/filter_dlg.c
+++ b/gtk/filter_dlg.c
@@ -1246,8 +1246,8 @@ static void
 color_filter_te(GtkWidget *w, guint16 red, guint16 green, guint16 blue)
 {
 #if GTK_CHECK_VERSION(3,0,0)
-    static GdkColor black = { 0, 0, 0, 1.0 };
-       GdkRGBA bg;
+    static GdkRGBA black = { 0, 0, 0, 1.0 };
+    GdkRGBA bg;
 
     bg.red      = red / 65535.0;
     bg.green    = green / 65535.0;
@@ -1256,7 +1256,7 @@ color_filter_te(GtkWidget *w, guint16 red, guint16 green, guint16 blue)
 
     gtk_widget_override_color(w, GTK_STATE_NORMAL, &black);
     gtk_widget_override_background_color(w, GTK_STATE_NORMAL, &bg);
-       gtk_widget_override_cursor(w, GTK_STATE_NORMAL, &black, &black);
+    gtk_widget_override_cursor(w, &black, &black);
 #else
     static GdkColor black = { 0, 0, 0, 0 };
     GdkColor    bg;
@@ -1276,12 +1276,12 @@ void
 colorize_filter_te_as_empty(GtkWidget *w)
 {
 #if GTK_CHECK_VERSION(3,0,0)
-       /* use defaults */
+    /* use defaults */
     gtk_widget_override_color(w, GTK_STATE_NORMAL, NULL);
     gtk_widget_override_background_color(w, GTK_STATE_NORMAL, NULL);
-       gtk_widget_override_cursor(w, GTK_STATE_NORMAL, NULL, NULL);
+    gtk_widget_override_cursor(w, NULL, NULL);
 #else    
-       /* use defaults */
+    /* use defaults */
     gtk_widget_modify_text(w, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_base(w, GTK_STATE_NORMAL, NULL);
     gtk_widget_modify_cursor(w, NULL, NULL);

diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index d0149110dc3e79d5b674fe377617dfc0184b621b..936ebc8ee78274a7077278c3d76483a15c299ad7 100644 (file)
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -1788,7 +1788,11 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box)
                         G_CALLBACK(v_scrollbar_changed), user_data);
 
        frame_box = gtk_frame_new(NULL);
+#if GTK_CHECK_VERSION(3,0,0)
+       gtk_widget_get_preferred_size(user_data->dlg.v_scrollbar, &scroll_requisition, NULL);
+#else
        gtk_widget_size_request(user_data->dlg.v_scrollbar, &scroll_requisition);
+#endif
        gtk_widget_set_size_request(frame_box, 1, scroll_requisition.width+2);
        gtk_frame_set_shadow_type(GTK_FRAME(frame_box), GTK_SHADOW_NONE);
        gtk_widget_show(frame_box);