diff options
Diffstat (limited to 'applets/clock')
| -rw-r--r-- | applets/clock/calendar-window.c | 12 | ||||
| -rw-r--r-- | applets/clock/clock-location-tile.c | 12 | ||||
| -rw-r--r-- | applets/clock/clock-location.c | 5 | ||||
| -rw-r--r-- | applets/clock/clock.c | 12 |
4 files changed, 19 insertions, 22 deletions
diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c index e800f272..ceb3a38d 100644 --- a/applets/clock/calendar-window.c +++ b/applets/clock/calendar-window.c @@ -43,9 +43,9 @@ #define KEY_LOCATIONS_EXPANDED "expand-locations" -#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) +#if !GTK_CHECK_VERSION (3, 0, 0) +#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b) +#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b) #endif enum { @@ -166,14 +166,14 @@ create_hig_frame (CalendarWindow *calwin, char *text; GtkWidget *expander; - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); bold_title = g_strdup_printf ("<b>%s</b>", title); expander = gtk_expander_new (bold_title); g_free (bold_title); gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), expander, FALSE, FALSE, 0); gtk_widget_show_all (vbox); @@ -252,7 +252,7 @@ calendar_window_fill (CalendarWindow *calwin) gtk_container_add (GTK_CONTAINER (calwin), frame); gtk_widget_show (frame); - vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_container_add (GTK_CONTAINER (frame), vbox); gtk_widget_show (vbox); diff --git a/applets/clock/clock-location-tile.c b/applets/clock/clock-location-tile.c index 48d57494..d34b8aba 100644 --- a/applets/clock/clock-location-tile.c +++ b/applets/clock/clock-location-tile.c @@ -17,14 +17,12 @@ #include "clock-marshallers.h" #include "set-timezone.h" -#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 #if GTK_CHECK_VERSION (3, 0, 0) G_DEFINE_TYPE (ClockLocationTile, clock_location_tile, GTK_TYPE_BIN) #else +#define gtk_box_new(GTK_ORIENTATION_HORIZONTAL, b) gtk_hbox_new(FALSE, b) +#define gtk_box_new(GTK_ORIENTATION_VERTICAL, b) gtk_vbox_new(FALSE, b) G_DEFINE_TYPE (ClockLocationTile, clock_location_tile, GTK_TYPE_ALIGNMENT) #endif @@ -290,13 +288,13 @@ clock_location_tile_fill (ClockLocationTile *this) gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 3, 3, 3, 0); #endif - tile = gtk_hbox_new (FALSE, 6); + tile = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); #if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_margin_top (tile, 3); gtk_widget_set_margin_bottom (tile, 3); gtk_widget_set_margin_start (tile, 3); #endif - head_section = gtk_vbox_new (FALSE, 0); + head_section = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); priv->city_label = gtk_label_new (NULL); #if GTK_CHECK_VERSION (3, 0, 0) @@ -337,7 +335,7 @@ clock_location_tile_fill (ClockLocationTile *this) gtk_container_add (GTK_CONTAINER (align), priv->weather_icon); #endif - box = gtk_hbox_new (FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (head_section), box, FALSE, FALSE, 0); #if GTK_CHECK_VERSION (3, 0, 0) gtk_box_pack_start (GTK_BOX (box), priv->weather_icon, FALSE, FALSE, 0); diff --git a/applets/clock/clock-location.c b/applets/clock/clock-location.c index 13495587..e2317b0d 100644 --- a/applets/clock/clock-location.c +++ b/applets/clock/clock-location.c @@ -22,11 +22,6 @@ #include "set-timezone.h" #include "system-timezone.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 - G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT) typedef struct { diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 370bf9ac..8a40ad63 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -85,10 +85,6 @@ #define KEY_TEMPERATURE_UNIT "temperature-unit" #define KEY_SPEED_UNIT "speed-unit" -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_vbox_new(X, Y) gtk_box_new(GTK_ORIENTATION_VERTICAL, Y) -#endif - enum { COL_CITY_NAME = 0, COL_CITY_TZ, @@ -1019,7 +1015,11 @@ create_clock_window (ClockData *cd) locations_box = calendar_window_get_locations_box (CALENDAR_WINDOW (cd->calendar_popup)); gtk_widget_show (locations_box); +#if GTK_CHECK_VERSION (3, 0, 0) + cd->clock_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); +#else cd->clock_vbox = gtk_vbox_new (FALSE, 6); +#endif gtk_container_add (GTK_CONTAINER (locations_box), cd->clock_vbox); cd->clock_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -1168,7 +1168,11 @@ create_cities_section (ClockData *cd) g_list_free (cd->location_tiles); cd->location_tiles = NULL; +#if GTK_CHECK_VERSION (3, 0, 0) + cd->cities_section = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); +#else cd->cities_section = gtk_vbox_new (FALSE, 6); +#endif gtk_container_set_border_width (GTK_CONTAINER (cd->cities_section), 0); cities = cd->locations; |