diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-23 00:04:15 +0100 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-01-25 16:53:59 +0300 |
| commit | 1241ff234a8ec46542e97e48a6298b78c9a0d2b5 (patch) | |
| tree | 1a23419da4aea0392649d03888b3cc2621011851 /src/caja-location-bar.c | |
| parent | 130906c9182c71a6049eca472f8d3b91804124cf (diff) | |
| download | caja-1241ff234a8ec46542e97e48a6298b78c9a0d2b5.tar.bz2 caja-1241ff234a8ec46542e97e48a6298b78c9a0d2b5.tar.xz | |
GTK3: fix deprecated GtkMisc
Diffstat (limited to 'src/caja-location-bar.c')
| -rw-r--r-- | src/caja-location-bar.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/caja-location-bar.c b/src/caja-location-bar.c index e2a70104..440e742f 100644 --- a/src/caja-location-bar.c +++ b/src/caja-location-bar.c @@ -251,6 +251,9 @@ style_set_handler (GtkWidget *widget, GtkStyle *previous_style) PangoLayout *layout; int width, width2; int xpad; +#if GTK_CHECK_VERSION (3, 0, 0) + gint margin_start, margin_end; +#endif layout = gtk_label_get_layout (GTK_LABEL(widget)); @@ -263,8 +266,14 @@ style_set_handler (GtkWidget *widget, GtkStyle *previous_style) pango_layout_get_pixel_size (layout, &width2, NULL); width = MAX (width, width2); +#if GTK_CHECK_VERSION (3, 0, 0) + margin_start = gtk_widget_get_margin_start (widget); + margin_end = gtk_widget_get_margin_end (widget); + xpad = margin_start + margin_end; +#else gtk_misc_get_padding (GTK_MISC (widget), &xpad, NULL); +#endif width += 2 * xpad; @@ -429,9 +438,9 @@ caja_location_bar_init (CajaLocationBar *bar) label = gtk_label_new (LOCATION_LABEL); gtk_container_add (GTK_CONTAINER (event_box), label); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); -#if GTK_CHECK_VERSION (3, 14, 0) - gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_widget_set_valign (label, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 1.0); + gtk_label_set_yalign (GTK_LABEL (label), 0.5); #else gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); #endif |