diff options
| author | raveit65 <[email protected]> | 2018-01-26 17:18:25 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-01-27 11:10:19 +0100 |
| commit | 9634424e8d633e5d290dde25b65b7f58db88104b (patch) | |
| tree | 8cb8e8eea491d631f81781d3abb0e95a23c47fd6 | |
| parent | afc842899268809a8e688dec5af10b373a6cd7e3 (diff) | |
| download | libmatekbd-9634424e8d633e5d290dde25b65b7f58db88104b.tar.bz2 libmatekbd-9634424e8d633e5d290dde25b65b7f58db88104b.tar.xz | |
building: remove < gtk+-3.22 bits and bump required gtk+
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | libmatekbd/matekbd-keyboard-drawing.c | 2 | ||||
| -rw-r--r-- | test/matekbd-keyboard-drawing-test.c | 9 |
3 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 056af91..3653cfe 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ AC_CONFIG_MACRO_DIR(m4) GLIB_REQUIRED=2.36 GIO_REQUIRED=2.25.0 -GTK_REQUIRED=3.14.0 +GTK_REQUIRED=3.22.0 GDK_REQUIRED=3.14.0 LIBXKLAVIER_REQUIRED=5.2 diff --git a/libmatekbd/matekbd-keyboard-drawing.c b/libmatekbd/matekbd-keyboard-drawing.c index a1344ee..e1eaf12 100644 --- a/libmatekbd/matekbd-keyboard-drawing.c +++ b/libmatekbd/matekbd-keyboard-drawing.c @@ -2176,10 +2176,8 @@ matekbd_keyboard_drawing_new (void) static void matekbd_keyboard_drawing_class_init (MatekbdKeyboardDrawingClass * klass) { -#if GTK_CHECK_VERSION (3, 20, 0) GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); gtk_widget_class_set_css_name (widget_class, "matekbd-keyboard-drawing"); -#endif klass->bad_keycode = NULL; diff --git a/test/matekbd-keyboard-drawing-test.c b/test/matekbd-keyboard-drawing-test.c index aaea743..015879b 100644 --- a/test/matekbd-keyboard-drawing-test.c +++ b/test/matekbd-keyboard-drawing-test.c @@ -161,11 +161,7 @@ main (gint argc, gchar ** argv) GtkWidget *window; GtkWidget *matekbd_keyboard_drawing; GdkScreen *screen; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - gint monitor; -#endif GdkRectangle rect; GOptionContext *context; GError *error = NULL; @@ -208,13 +204,8 @@ main (gint argc, gchar ** argv) G_CALLBACK (gtk_main_quit), NULL); screen = gtk_window_get_screen (GTK_WINDOW (window)); -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (gdk_screen_get_display (screen), 0, 0); gdk_monitor_get_geometry (monitor, &rect); -#else - monitor = gdk_screen_get_monitor_at_point (screen, 0, 0); - gdk_screen_get_monitor_geometry (screen, monitor, &rect); -#endif gtk_window_set_default_size (GTK_WINDOW (window), rect.width * 4 / 5, rect.height * 1 / 2); |