summaryrefslogtreecommitdiff
path: root/src/ui/metaaccellabel.c
diff options
context:
space:
mode:
authormonsta <[email protected]>2018-01-27 23:29:02 +0300
committerraveit65 <[email protected]>2018-01-28 16:15:18 +0100
commit16de6ccd2906b93f79880612b31a12a1e53557c7 (patch)
treec1643f9e04908007ee58457f7532225a9f56d7bd /src/ui/metaaccellabel.c
parent4525d9b629ed76df0bc7d9b10b52c990fa112351 (diff)
downloadmarco-16de6ccd2906b93f79880612b31a12a1e53557c7.tar.bz2
marco-16de6ccd2906b93f79880612b31a12a1e53557c7.tar.xz
require GTK+ 3.22 and GLib 2.50
Diffstat (limited to 'src/ui/metaaccellabel.c')
-rw-r--r--src/ui/metaaccellabel.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index 319bceaa..93c16152 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -243,9 +243,6 @@ meta_accel_label_draw (GtkWidget *widget,
cairo_t *cr)
{
MetaAccelLabel *accel_label = META_ACCEL_LABEL (widget);
-#if !GTK_CHECK_VERSION (3, 16, 0)
- GtkMisc *misc = GTK_MISC (accel_label);
-#endif
GtkTextDirection direction;
int ac_width;
GtkAllocation allocation;
@@ -264,19 +261,11 @@ meta_accel_label_draw (GtkWidget *widget,
PangoLayout *accel_layout;
GtkLabel *label = GTK_LABEL (widget);
gint x, y, xpad, ypad;
-#if GTK_CHECK_VERSION (3, 16, 0)
gint margin_start, margin_end, margin_top, margin_bottom;
gfloat yalign;
-#else
- gfloat xalign, yalign;
-#endif
label_layout = gtk_label_get_layout (GTK_LABEL (accel_label));
-#if GTK_CHECK_VERSION (3, 16, 0)
yalign = gtk_label_get_yalign (GTK_LABEL (accel_label));
-#else
- gtk_misc_get_alignment (misc, &xalign, &yalign);
-#endif
cairo_save (cr);
@@ -303,7 +292,6 @@ meta_accel_label_draw (GtkWidget *widget,
cairo_restore (cr);
-#if GTK_CHECK_VERSION (3, 16, 0)
margin_start = gtk_widget_get_margin_start (widget);
margin_end = gtk_widget_get_margin_end (widget);
margin_top = gtk_widget_get_margin_top (widget);
@@ -311,9 +299,6 @@ meta_accel_label_draw (GtkWidget *widget,
xpad = margin_start + margin_end;
ypad = margin_top + margin_bottom;
-#else
- gtk_misc_get_padding (misc, &xpad, &ypad);
-#endif
if (direction == GTK_TEXT_DIR_RTL)
x = xpad;