diff options
author | Sorokin Alexei <[email protected]> | 2016-06-24 23:33:04 +0300 |
---|---|---|
committer | raveit65 <[email protected]> | 2016-06-29 18:42:12 +0200 |
commit | 882f8f4d9959b6b27f08d2ddb525c7347df1797c (patch) | |
tree | badcf506263d22bd15f0c4a77c41b431e4e65f09 /mate-panel | |
parent | 8acec6d1ae0e50f0eee68ce6153d04a3beb5d52a (diff) | |
download | mate-panel-882f8f4d9959b6b27f08d2ddb525c7347df1797c.tar.bz2 mate-panel-882f8f4d9959b6b27f08d2ddb525c7347df1797c.tar.xz |
use gtk_box_new instead of gtk_{h,v}box_new properly
Diffstat (limited to 'mate-panel')
-rw-r--r-- | mate-panel/nothing.cP | 7 | ||||
-rw-r--r-- | mate-panel/panel-addto.c | 13 | ||||
-rw-r--r-- | mate-panel/panel-ditem-editor.c | 8 | ||||
-rw-r--r-- | mate-panel/panel-force-quit.c | 8 |
4 files changed, 20 insertions, 16 deletions
diff --git a/mate-panel/nothing.cP b/mate-panel/nothing.cP index 71441287..e3f2b51e 100644 --- a/mate-panel/nothing.cP +++ b/mate-panel/nothing.cP @@ -6,9 +6,6 @@ #include <cairo.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y) -#endif #include <canberra-gtk.h> #ifdef CA_CHECK_VERSION @@ -1397,7 +1394,11 @@ start_geginv (void) gtk_widget_set_double_buffered (GTK_WIDGET (geginv_canvas), FALSE); gtk_widget_set_size_request (geginv_canvas, inv_width, inv_height); +#if GTK_CHECK_VERSION (3, 0, 0) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#else vbox = gtk_vbox_new (FALSE, 0); +#endif gtk_container_add (GTK_CONTAINER (geginv), vbox); gtk_box_pack_start (GTK_BOX (vbox), geginv_canvas, TRUE, TRUE, 0); diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c index eac9be93..bd1f47c6 100644 --- a/mate-panel/panel-addto.c +++ b/mate-panel/panel-addto.c @@ -52,11 +52,6 @@ #include "panel-schemas.h" #include "panel-stock-icons.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y) -#define gtk_hbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL, Y) -#endif - typedef struct { PanelWidget *panel_widget; @@ -1253,10 +1248,18 @@ panel_addto_dialog_new (PanelWidget *panel_widget) g_signal_connect (dialog->addto_dialog, "destroy", G_CALLBACK (panel_addto_dialog_destroy), dialog); +#if GTK_CHECK_VERSION (3, 0, 0) + inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); +#else inner_vbox = gtk_vbox_new (FALSE, 6); +#endif gtk_box_pack_start (GTK_BOX (dialog_vbox), inner_vbox, TRUE, TRUE, 0); +#if GTK_CHECK_VERSION (3, 0, 0) + find_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); +#else find_hbox = gtk_hbox_new (FALSE, 6); +#endif gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0); dialog->label = gtk_label_new_with_mnemonic (""); diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c index c8bb3d76..5d18bfc6 100644 --- a/mate-panel/panel-ditem-editor.c +++ b/mate-panel/panel-ditem-editor.c @@ -40,10 +40,6 @@ #include "panel-util.h" #include "panel-marshal.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_hbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL, Y) -#endif - struct _PanelDItemEditorPrivate { /* we keep a ditem around, since we can never have absolutely @@ -650,7 +646,11 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog) /* Command */ priv->command_label = label_new_with_mnemonic (""); +#if GTK_CHECK_VERSION (3, 0, 0) + priv->command_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); +#else priv->command_hbox = gtk_hbox_new (FALSE, 12); +#endif gtk_widget_show (priv->command_hbox); priv->command_entry = gtk_entry_new (); diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c index ac7611a3..60a35323 100644 --- a/mate-panel/panel-force-quit.c +++ b/mate-panel/panel-force-quit.c @@ -37,10 +37,6 @@ #include "panel-icon-names.h" #include "panel-stock-icons.h" -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y) -#endif - static GdkFilterReturn popup_filter (GdkXEvent *gdk_xevent, GdkEvent *event, GtkWidget *popup); @@ -69,7 +65,11 @@ display_popup_window (GdkScreen *screen) gtk_container_add (GTK_CONTAINER (retval), frame); gtk_widget_show (frame); +#if GTK_CHECK_VERSION (3, 0, 0) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#else vbox = gtk_vbox_new (FALSE, 0); +#endif gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); |