summaryrefslogtreecommitdiff
path: root/applets/notification_area
diff options
context:
space:
mode:
authorSorokin Alexei <[email protected]>2016-06-24 23:33:04 +0300
committerraveit65 <[email protected]>2016-06-29 18:42:12 +0200
commit882f8f4d9959b6b27f08d2ddb525c7347df1797c (patch)
treebadcf506263d22bd15f0c4a77c41b431e4e65f09 /applets/notification_area
parent8acec6d1ae0e50f0eee68ce6153d04a3beb5d52a (diff)
downloadmate-panel-882f8f4d9959b6b27f08d2ddb525c7347df1797c.tar.bz2
mate-panel-882f8f4d9959b6b27f08d2ddb525c7347df1797c.tar.xz
use gtk_box_new instead of gtk_{h,v}box_new properly
Diffstat (limited to 'applets/notification_area')
-rw-r--r--applets/notification_area/na-tray.c5
-rw-r--r--applets/notification_area/testtray.c13
2 files changed, 8 insertions, 10 deletions
diff --git a/applets/notification_area/na-tray.c b/applets/notification_area/na-tray.c
index 996bd693..b07376c2 100644
--- a/applets/notification_area/na-tray.c
+++ b/applets/notification_area/na-tray.c
@@ -34,11 +34,6 @@
#define ICON_SPACING 1
#define MIN_BOX_SIZE 3
-#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
{
NaTrayManager *tray_manager;
diff --git a/applets/notification_area/testtray.c b/applets/notification_area/testtray.c
index c541aaa2..0cb38e92 100644
--- a/applets/notification_area/testtray.c
+++ b/applets/notification_area/testtray.c
@@ -29,11 +29,6 @@
#define NOTIFICATION_AREA_ICON "mate-panel-notification-area"
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y)
-#define gtk_vbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_VERTICAL,Y)
-#endif
-
static guint n_windows = 0;
typedef struct
@@ -155,14 +150,22 @@ create_tray_on_screen (GdkScreen *screen,
data->window = window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_object_weak_ref (G_OBJECT (window), (GWeakNotify) maybe_quit, NULL);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+#else
vbox = gtk_vbox_new (FALSE, 6);
+#endif
gtk_container_add (GTK_CONTAINER (window), vbox);
button = gtk_button_new_with_mnemonic ("_Add another tray");
g_signal_connect (button, "clicked", G_CALLBACK (add_tray_cb), data);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+#else
hbox = gtk_hbox_new (FALSE, 12);
+#endif
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new_with_mnemonic ("_Orientation:");
#if GTK_CHECK_VERSION (3, 16, 0)