diff options
| author | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-21 21:14:26 +0300 |
| commit | d0ddaedffa7d417a699cafce73c1e418515c4a28 (patch) | |
| tree | 645b7a86e32b21113e1ce14f563bfb8d8900fa53 /mate-panel/xstuff.c | |
| parent | 7dfeb78328039cf92a9f45d64c9b3662d967a1fe (diff) | |
| download | mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.bz2 mate-panel-d0ddaedffa7d417a699cafce73c1e418515c4a28.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmate-desktop >= 1.17
WARNING: use GTK+3 build of libmateweather for this build.
that lib is not migrated to GTK+3 only as we will possibly
use libgweather instead of it.
Diffstat (limited to 'mate-panel/xstuff.c')
| -rw-r--r-- | mate-panel/xstuff.c | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c index 42dc3b78..7753973e 100644 --- a/mate-panel/xstuff.c +++ b/mate-panel/xstuff.c @@ -217,11 +217,7 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) gdk_window_move_resize (window, x, y, w, h); gdk_flush (); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif g_object_set_data (G_OBJECT (window), "xstuff-cached-x", GINT_TO_POINTER (x)); g_object_set_data (G_OBJECT (window), "xstuff-cached-y", GINT_TO_POINTER (y)); @@ -318,13 +314,8 @@ idle_destroy (gpointer data) } static gboolean -#if GTK_CHECK_VERSION (3, 0, 0) zoom_draw (GtkWidget *widget, cairo_t *cr, -#else -zoom_expose (GtkWidget *widget, - GdkEventExpose *event, -#endif gpointer user_data) { CompositedZoomData *zoom; @@ -347,9 +338,6 @@ zoom_expose (GtkWidget *widget, GdkPixbuf *scaled; int width, height; int x = 0, y = 0; -#if !GTK_CHECK_VERSION (3, 0, 0) - cairo_t *cr; -#endif gtk_window_get_size (GTK_WINDOW (widget), &width, &height); @@ -382,9 +370,6 @@ zoom_expose (GtkWidget *widget, break; } -#if !GTK_CHECK_VERSION (3, 0, 0) - cr = gdk_cairo_create (gtk_widget_get_window (widget)); -#endif cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_source_rgba (cr, 0, 0, 0, 0.0); cairo_rectangle (cr, 0, 0, width, height); @@ -394,9 +379,6 @@ zoom_expose (GtkWidget *widget, cairo_set_operator (cr, CAIRO_OPERATOR_OVER); cairo_paint_with_alpha (cr, MAX (zoom->opacity, 0)); -#if !GTK_CHECK_VERSION (3, 0, 0) - cairo_destroy (cr); -#endif g_object_unref (scaled); } @@ -431,11 +413,7 @@ draw_zoom_animation_composited (GdkScreen *gscreen, gtk_window_set_keep_above (GTK_WINDOW (win), TRUE); gtk_window_set_decorated (GTK_WINDOW (win), FALSE); gtk_widget_set_app_paintable(win, TRUE); -#if GTK_CHECK_VERSION (3, 0, 0) gtk_widget_set_visual (win, gdk_screen_get_rgba_visual (gscreen)); -#else - gtk_widget_set_colormap (win, gdk_screen_get_rgba_colormap (gscreen)); -#endif gtk_window_set_gravity (GTK_WINDOW (win), GDK_GRAVITY_STATIC); gtk_window_set_default_size (GTK_WINDOW (win), @@ -465,21 +443,12 @@ draw_zoom_animation_composited (GdkScreen *gscreen, gtk_window_move (GTK_WINDOW (win), wx, wy); -#if GTK_CHECK_VERSION (3, 0, 0) g_signal_connect (G_OBJECT (win), "draw", G_CALLBACK (zoom_draw), zoom); -#else - g_signal_connect (G_OBJECT (win), "expose-event", - G_CALLBACK (zoom_expose), zoom); -#endif /* see doc for gtk_widget_set_app_paintable() */ gtk_widget_realize (win); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_window_set_background_pattern (gtk_widget_get_window (win), NULL); -#else - gdk_window_set_back_pixmap (gtk_widget_get_window (win), NULL, FALSE); -#endif gtk_widget_show (win); zoom->timeout_id = g_timeout_add (ZOOM_DELAY, @@ -509,17 +478,9 @@ draw_zoom_animation (GdkScreen *gscreen, dpy = gdk_x11_display_get_xdisplay (gdk_screen_get_display (gscreen)); root_win = GDK_WINDOW_XID (gdk_screen_get_root_window (gscreen)); screen = gdk_screen_get_number (gscreen); -#if GTK_CHECK_VERSION (3, 0, 0) depth = DefaultDepth(dpy,screen); -#else - depth = gdk_drawable_get_depth (gdk_screen_get_root_window (gscreen)); -#endif /* frame GC */ -#if !GTK_CHECK_VERSION (3, 0, 0) - gdk_colormap_alloc_color ( - gdk_screen_get_system_colormap (gscreen), &color, FALSE, TRUE); -#endif gcv.function = GXxor; /* this will raise the probability of the XORed color being different * of the original color in PseudoColor when not all color cells are @@ -610,10 +571,6 @@ draw_zoom_animation (GdkScreen *gscreen, XUngrabServer(dpy); XFreeGC (dpy, frame_gc); -#if !GTK_CHECK_VERSION (3, 0, 0) - gdk_colormap_free_colors (gdk_screen_get_system_colormap (gscreen), - &color, 1); -#endif } #undef FRAMES @@ -709,11 +666,7 @@ xstuff_grab_key_on_all_screens (int keycode, int i; display = gdk_display_get_default (); -#if GTK_CHECK_VERSION(3, 10, 0) n_screens = 1; /* gdk-3.10, The number of screens is always 1 */ -#else - n_screens = gdk_display_get_n_screens (display); -#endif for (i = 0; i < n_screens; i++) { GdkWindow *root; |