From 3272ec9240f708ba4afbf4eeab9b351c20ce644d Mon Sep 17 00:00:00 2001 From: Fabiano Fidêncio Date: Tue, 6 Oct 2015 19:51:13 +0200 Subject: Drop support to gtk2 The 3.0 release was the last one that still supports GTK2. For the Windows builds the support to GTK2 was dropped in the previous release. Let's do the same for the entire project now. --- src/virt-viewer-display.c | 96 ----------------------------------------------- 1 file changed, 96 deletions(-) (limited to 'src/virt-viewer-display.c') diff --git a/src/virt-viewer-display.c b/src/virt-viewer-display.c index d8b3312..d7ef3c3 100644 --- a/src/virt-viewer-display.c +++ b/src/virt-viewer-display.c @@ -36,10 +36,6 @@ struct _VirtViewerDisplayPrivate { -#if !GTK_CHECK_VERSION(3, 0, 0) - gboolean dirty; - gboolean size_request_once; -#endif guint desktopWidth; guint desktopHeight; guint zoom_level; @@ -51,17 +47,12 @@ struct _VirtViewerDisplayPrivate gboolean fullscreen; }; -#if !GTK_CHECK_VERSION(3, 0, 0) -static void virt_viewer_display_size_request(GtkWidget *widget, - GtkRequisition *requisition); -#else static void virt_viewer_display_get_preferred_width(GtkWidget *widget, int *minwidth, int *defwidth); static void virt_viewer_display_get_preferred_height(GtkWidget *widget, int *minheight, int *defheight); -#endif static void virt_viewer_display_size_allocate(GtkWidget *widget, GtkAllocation *allocation); static void virt_viewer_display_set_property(GObject *object, @@ -100,12 +91,8 @@ virt_viewer_display_class_init(VirtViewerDisplayClass *class) object_class->set_property = virt_viewer_display_set_property; object_class->get_property = virt_viewer_display_get_property; -#if GTK_CHECK_VERSION(3, 0, 0) widget_class->get_preferred_width = virt_viewer_display_get_preferred_width; widget_class->get_preferred_height = virt_viewer_display_get_preferred_height; -#else - widget_class->size_request = virt_viewer_display_size_request; -#endif widget_class->size_allocate = virt_viewer_display_size_allocate; widget_class->grab_focus = virt_viewer_display_grab_focus; @@ -278,10 +265,6 @@ virt_viewer_display_init(VirtViewerDisplay *display) display->priv->desktopHeight = 100; display->priv->zoom_level = NORMAL_ZOOM_LEVEL; display->priv->zoom = TRUE; -#if !GTK_CHECK_VERSION(3, 0, 0) - display->priv->dirty = TRUE; - display->priv->size_request_once = FALSE; -#endif } GtkWidget* @@ -383,75 +366,10 @@ virt_viewer_display_grab_focus(GtkWidget *widget) void virt_viewer_display_get_preferred_size(VirtViewerDisplay *self, GtkRequisition *requisition) { -#if GTK_CHECK_VERSION(3, 0, 0) gtk_widget_get_preferred_size(GTK_WIDGET(self), NULL, requisition); -#else - VirtViewerDisplayPrivate *priv = self->priv; - int border_width = gtk_container_get_border_width(GTK_CONTAINER(self)); - - requisition->width = border_width * 2; - requisition->height = border_width * 2; - - if (priv->zoom) { - requisition->width += round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); - requisition->height += round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); - } else { - requisition->width += priv->desktopWidth; - requisition->height += priv->desktopHeight; - } -#endif } -#if !GTK_CHECK_VERSION(3, 0, 0) -static gboolean -virt_viewer_display_idle(gpointer opaque) -{ - VirtViewerDisplay *display = opaque; - VirtViewerDisplayPrivate *priv = display->priv; - if (!priv->dirty) - gtk_widget_queue_resize_no_redraw(GTK_WIDGET(display)); - return FALSE; -} - - -static void -virt_viewer_display_size_request(GtkWidget *widget, - GtkRequisition *requisition) -{ - VirtViewerDisplay *display = VIRT_VIEWER_DISPLAY(widget); - VirtViewerDisplayPrivate *priv = display->priv; - - if (priv->dirty || !priv->size_request_once) { - virt_viewer_display_get_preferred_size(display, requisition); - } else { - requisition->width = MIN_DISPLAY_WIDTH; - requisition->height = MIN_DISPLAY_HEIGHT; - } - - priv->size_request_once = TRUE; - g_debug("Display size request %dx%d (desktop %dx%d)", - requisition->width, requisition->height, - priv->desktopWidth, priv->desktopHeight); -} - -static void -virt_viewer_display_make_resizable(VirtViewerDisplay *self) -{ - VirtViewerDisplayPrivate *priv = self->priv; - - /* This unsets the size request, so that the user can - * manually resize the window smaller again - */ - if (priv->dirty) { - g_idle_add(virt_viewer_display_idle, GTK_WIDGET(self)); - if (gtk_widget_get_mapped(GTK_WIDGET(self))) - priv->dirty = FALSE; - } -} - -#else - static void virt_viewer_display_get_preferred_width(GtkWidget *widget, int *minwidth, int *defwidth) @@ -488,8 +406,6 @@ static void virt_viewer_display_get_preferred_height(GtkWidget *widget, *defheight = priv->desktopHeight + 2 * border_height; } } -#endif - static void virt_viewer_display_size_allocate(GtkWidget *widget, @@ -510,11 +426,7 @@ virt_viewer_display_size_allocate(GtkWidget *widget, if (priv->desktopWidth == 0 || priv->desktopHeight == 0) -#if !GTK_CHECK_VERSION(3, 0, 0) - goto end; -#else return; -#endif desktopAspect = (double)priv->desktopWidth / (double)priv->desktopHeight; @@ -539,11 +451,6 @@ virt_viewer_display_size_allocate(GtkWidget *widget, g_debug("Child allocate %dx%d", child_allocation.width, child_allocation.height); gtk_widget_size_allocate(child, &child_allocation); } - -#if !GTK_CHECK_VERSION(3, 0, 0) -end: - virt_viewer_display_make_resizable(VIRT_VIEWER_DISPLAY(widget)); -#endif } @@ -581,9 +488,6 @@ void virt_viewer_display_queue_resize(VirtViewerDisplay *display) GtkWidget *child = gtk_bin_get_child(GTK_BIN(display)); if (child && gtk_widget_get_visible(child)) { -#if !GTK_CHECK_VERSION(3, 0, 0) - display->priv->dirty = TRUE; -#endif gtk_widget_queue_resize(GTK_WIDGET(display)); } } -- cgit