diff options
author | Anders Broman <anders.broman@ericsson.com> | 2012-04-21 20:45:35 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2012-04-21 20:45:35 +0000 |
commit | c48331700661d96b7f824539ddd07d1d550b4465 (patch) | |
tree | 17f44309c0899dd6e31334e47ae37e10e1a0ed8d /ui/gtk | |
parent | 780061ed7469efc504128d8e61a1e8ad0b219c5c (diff) |
port gtk_scrollbar_new() gtk_paned_new() gtk_separator_new() to GTK2
svn path=/trunk/; revision=42186
Diffstat (limited to 'ui/gtk')
-rw-r--r-- | ui/gtk/dlg_utils.c | 4 | ||||
-rw-r--r-- | ui/gtk/graph_analysis.c | 6 | ||||
-rw-r--r-- | ui/gtk/gui_utils.c | 27 | ||||
-rw-r--r-- | ui/gtk/gui_utils.h | 3 | ||||
-rw-r--r-- | ui/gtk/main_statusbar.c | 4 | ||||
-rw-r--r-- | ui/gtk/manual_addr_resolv.c | 2 |
6 files changed, 38 insertions, 8 deletions
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 8ec3cb3a64..1d56cd8b94 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -225,13 +225,13 @@ dlg_button_row_new(const gchar *stock_id_first, ...) hbox = ws_gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0, FALSE); gtk_widget_show(hbox); - button_hbox = gtk_hbutton_box_new(); + button_hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), button_hbox, TRUE, TRUE, 0); g_object_set_data(G_OBJECT(hbox), BUTTON_HBOX_KEY, button_hbox); gtk_widget_show(button_hbox); gtk_box_set_spacing(GTK_BOX(button_hbox), DLG_BUTTON_SPACING); - help_hbox = gtk_hbutton_box_new(); + help_hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_end(GTK_BOX(hbox), help_hbox, FALSE, FALSE, 0); gtk_widget_show(help_hbox); gtk_box_set_spacing(GTK_BOX(help_hbox), DLG_BUTTON_SPACING); diff --git a/ui/gtk/graph_analysis.c b/ui/gtk/graph_analysis.c index a0602a7f1f..86d7fa02fa 100644 --- a/ui/gtk/graph_analysis.c +++ b/ui/gtk/graph_analysis.c @@ -1869,7 +1869,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) /* Allow the hbox with time to expand (TRUE, TRUE) */ gtk_box_pack_start(GTK_BOX(hbox), frame_time, FALSE, FALSE, 3); - user_data->dlg.hpane = gtk_hpaned_new(); + user_data->dlg.hpane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); gtk_paned_pack1(GTK_PANED (user_data->dlg.hpane), user_data->dlg.scroll_window, FALSE, TRUE); gtk_paned_pack2(GTK_PANED (user_data->dlg.hpane), scroll_window_comments, TRUE, TRUE); g_signal_connect(user_data->dlg.hpane, "notify::position", G_CALLBACK(pane_callback), user_data); @@ -1883,7 +1883,7 @@ static void create_draw_area(graph_analysis_data_t *user_data, GtkWidget *box) /* create the associated v_scrollbar */ user_data->dlg.v_scrollbar_adjustment=(GtkAdjustment *)gtk_adjustment_new(0,0,0,0,0,0); - user_data->dlg.v_scrollbar=gtk_vscrollbar_new(user_data->dlg.v_scrollbar_adjustment); + user_data->dlg.v_scrollbar=gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, user_data->dlg.v_scrollbar_adjustment); gtk_widget_show(user_data->dlg.v_scrollbar); gtk_box_pack_start(GTK_BOX(scroll_vbox), user_data->dlg.v_scrollbar, TRUE, TRUE, 0); g_signal_connect(user_data->dlg.v_scrollbar_adjustment, "value_changed", @@ -1941,7 +1941,7 @@ static void dialog_graph_create_window(graph_analysis_data_t *user_data) create_draw_area(user_data, vbox); /* button row */ - hbuttonbox = gtk_hbutton_box_new (); + hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start (GTK_BOX (vbox), hbuttonbox, FALSE, FALSE, 10); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox), GTK_BUTTONBOX_SPREAD); gtk_box_set_spacing (GTK_BOX (hbuttonbox), 30); diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c index 49f97598c1..a6f0eff6b7 100644 --- a/ui/gtk/gui_utils.c +++ b/ui/gtk/gui_utils.c @@ -1909,4 +1909,31 @@ GtkWidget * gtk_button_box_new(GtkOrientation orientation) return gtk_vbutton_box_new(); } } + +GtkWidget * gtk_scrollbar_new(GtkOrientation orientation, GtkAdjustment *adjustment) +{ + if (orientation == GTK_ORIENTATION_HORIZONTAL){ + return gtk_hscrollbar_new(GtkAdjustment *adjustment); + }else{ + return gtk_vscrollbar_new(GtkAdjustment *adjustment); + } +} + +GtkWidget * gtk_paned_new(GtkOrientation orientation) +{ + if (orientation == GTK_ORIENTATION_HORIZONTAL){ + return gtk_hpaned_new(); + }else{ + return gtk_vpaned_new(); + } +} + +GtkWidget * gtk_separator_new (GtkOrientation orientation) +{ + if (orientation == GTK_ORIENTATION_HORIZONTAL){ + return gtk_hseparator_new (); + }else{ + return gtk_vseparator_new (); + } +} #endif /* GTK_CHECK_VERSION(3,0,0) */ diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h index cdef1c0c85..9a8b0109fe 100644 --- a/ui/gtk/gui_utils.h +++ b/ui/gtk/gui_utils.h @@ -519,5 +519,8 @@ GtkWidget * ws_gtk_box_new(GtkOrientation orientation, gint spacing, gboolean ho #if !GTK_CHECK_VERSION(3,0,0) GtkWidget * gtk_button_box_new(GtkOrientation orientation); +GtkWidget * gtk_scrollbar_new(GtkOrientation orientation, GtkAdjustment *adjustment); +GtkWidget * gtk_paned_new(GtkOrientation orientation); +GtkWidget * gtk_separator_new (GtkOrientation orientation); #endif /* GTK_CHECK_VERSION(3,0,0) */ #endif /* __GUI_UTIL__H__ */ diff --git a/ui/gtk/main_statusbar.c b/ui/gtk/main_statusbar.c index 455829c27c..fe3dc074db 100644 --- a/ui/gtk/main_statusbar.c +++ b/ui/gtk/main_statusbar.c @@ -318,9 +318,9 @@ statusbar_new(void) status_capture_comment_new(); /* Pane for the statusbar */ - status_pane_left = gtk_hpaned_new(); + status_pane_left = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); gtk_widget_show(status_pane_left); - status_pane_right = gtk_hpaned_new(); + status_pane_right = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL); gtk_widget_show(status_pane_right); return status_hbox; diff --git a/ui/gtk/manual_addr_resolv.c b/ui/gtk/manual_addr_resolv.c index e67dc75616..3d7eb1763c 100644 --- a/ui/gtk/manual_addr_resolv.c +++ b/ui/gtk/manual_addr_resolv.c @@ -151,7 +151,7 @@ manual_addr_resolv_dlg (GtkWidget *w _U_, gpointer data) gtk_table_attach_defaults (GTK_TABLE (table), name_te, 1, 2, 1, 2); g_object_set_data (G_OBJECT(man_addr_resolv_dlg), "name", name_te); - sep = gtk_hseparator_new (); + sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_container_add (GTK_CONTAINER(vbox), sep); resolv_cb = gtk_check_button_new_with_mnemonic ("Enable network name resolution"); |