diff options
| author | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-06 14:43:26 +0300 |
| commit | 4c06cb5cd0859067769dac1317682d430b18cc78 (patch) | |
| tree | 0c363ee71311366fb2016df9858858ef5ef2d25d /pluma/pluma-statusbar.c | |
| parent | 65371f53dbb06180b750dad7c19e7bcf0f8651d6 (diff) | |
| download | pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.bz2 pluma-4c06cb5cd0859067769dac1317682d430b18cc78.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
Diffstat (limited to 'pluma/pluma-statusbar.c')
| -rw-r--r-- | pluma/pluma-statusbar.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pluma/pluma-statusbar.c b/pluma/pluma-statusbar.c index 7854fd8b..e67990f9 100644 --- a/pluma/pluma-statusbar.c +++ b/pluma/pluma-statusbar.c @@ -42,10 +42,6 @@ PLUMA_TYPE_STATUSBAR,\ PlumaStatusbarPrivate)) -#if GTK_CHECK_VERSION (3, 0, 0) -#define gtk_hbox_new(X,Y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,Y) -#endif - struct _PlumaStatusbarPrivate { GtkWidget *overwrite_mode_label; @@ -114,10 +110,8 @@ pluma_statusbar_init (PlumaStatusbar *statusbar) statusbar->priv = PLUMA_STATUSBAR_GET_PRIVATE (statusbar); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_margin_top (GTK_WIDGET (statusbar), 0); gtk_widget_set_margin_bottom (GTK_WIDGET (statusbar), 0); -#endif statusbar->priv->overwrite_mode_label = gtk_label_new (NULL); gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), @@ -139,7 +133,7 @@ pluma_statusbar_init (PlumaStatusbar *statusbar) gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->state_frame), GTK_SHADOW_IN); - hbox = gtk_hbox_new (FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (statusbar->priv->state_frame), hbox); statusbar->priv->load_image = gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_MENU); @@ -165,20 +159,11 @@ pluma_statusbar_init (PlumaStatusbar *statusbar) statusbar->priv->error_frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (statusbar->priv->error_frame), GTK_SHADOW_IN); -#if GTK_CHECK_VERSION (3, 10, 0) error_image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_MENU); -#else - error_image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_MENU); -#endif -#if GTK_CHECK_VERSION (3, 14, 0) gtk_widget_set_margin_start (error_image, 4); gtk_widget_set_margin_end (error_image, 4); gtk_widget_set_margin_top (error_image, 0); gtk_widget_set_margin_bottom (error_image, 0); -#else - gtk_misc_set_padding (GTK_MISC (error_image), 4, 0); - gtk_widget_show (error_image); -#endif statusbar->priv->error_event_box = gtk_event_box_new (); gtk_event_box_set_visible_window (GTK_EVENT_BOX (statusbar->priv->error_event_box), |