From 3ffbaa0104c762931e50e33a8ab877384f46127f Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Thu, 23 Jan 2014 09:55:12 +0100 Subject: Use gtk_widget_get_preferred_size with GTK3 --- applets/clock/clock-face.c | 4 ++++ applets/clock/clock.c | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'applets') diff --git a/applets/clock/clock-face.c b/applets/clock/clock-face.c index 333af62f..25c0b182 100644 --- a/applets/clock/clock-face.c +++ b/applets/clock/clock-face.c @@ -267,7 +267,11 @@ clock_face_size_request (GtkWidget *this, GtkRequisition req; /* Tie our size to the height of the size_widget */ +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (GTK_WIDGET (priv->size_widget), &req, NULL); +#else gtk_widget_size_request (GTK_WIDGET (priv->size_widget), &req); +#endif /* Pad out our height by a little bit - this improves the balance */ diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 78b92c07..0722e4ad 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -840,7 +840,11 @@ position_calendar_popup (ClockData *cd) &x, &y); gtk_window_get_size (GTK_WINDOW (cd->calendar_popup), &w, &h); +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_widget_get_preferred_size (cd->calendar_popup, &req, NULL); +#else gtk_widget_size_request (cd->calendar_popup, &req); +#endif w = req.width; h = req.height; -- cgit v1.2.1