X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-loading-window.c;h=4d5eaaf1407f4ee129bc18940d7c906790dc67db;hb=8c225e626012b51f44a33af4be67755d9be47be0;hp=a3dd3b37fcf93c01b05bebaed72a2431bc88094d;hpb=d634a9b20c24e7597d17d475c144b83f00ca9b43;p=evince.git diff --git a/libview/ev-loading-window.c b/libview/ev-loading-window.c index a3dd3b37..4d5eaaf1 100644 --- a/libview/ev-loading-window.c +++ b/libview/ev-loading-window.c @@ -177,12 +177,8 @@ ev_loading_window_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { EvLoadingWindow *window = EV_LOADING_WINDOW (widget); -#if GTK_CHECK_VERSION (2, 90, 8) cairo_surface_t *surface; - cairo_region_t *shape; -#else - GdkPixmap *mask; -#endif + cairo_region_t *shape; cairo_t *cr; double r; @@ -194,15 +190,10 @@ ev_loading_window_size_allocate (GtkWidget *widget, window->width = allocation->width; window->height = allocation->height; -#if GTK_CHECK_VERSION (2, 90, 8) surface = cairo_image_surface_create (CAIRO_FORMAT_A8, window->width, window->height); cr = cairo_create (surface); -#else - mask = gdk_pixmap_new (NULL, window->width, window->height, 1); - cr = gdk_cairo_create (GDK_DRAWABLE (mask)); -#endif cairo_save (cr); cairo_rectangle (cr, 0, 0, window->width, window->height); @@ -217,16 +208,11 @@ ev_loading_window_size_allocate (GtkWidget *widget, cairo_destroy (cr); -#if GTK_CHECK_VERSION (2, 90, 8) shape = gdk_cairo_region_create_from_surface (surface); cairo_surface_destroy (surface); gtk_widget_shape_combine_region (widget, shape); cairo_region_destroy (shape); -#else - gtk_widget_shape_combine_mask (widget, mask, 0, 0); - g_object_unref (mask); -#endif } static void