diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2010-12-10 20:15:27 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-25 23:37:16 +0800 |
| commit | b7c2f49973b93c2e80bed6f10c534af17b757c04 (patch) | |
| tree | 938da8b0b636884610fa745542cb85f100fc8331 /calendar | |
| parent | a2f59fe0fc9e1b8737759ecb884bca18fa8defe3 (diff) | |
| download | gsoc2013-evolution-b7c2f49973b93c2e80bed6f10c534af17b757c04.tar.gz gsoc2013-evolution-b7c2f49973b93c2e80bed6f10c534af17b757c04.tar.zst gsoc2013-evolution-b7c2f49973b93c2e80bed6f10c534af17b757c04.zip | |
Adapt size_request vfuncs to latest gtk+-3.0 API.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/weekday-picker.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c index c2165f6d16..44993724a9 100644 --- a/calendar/gui/weekday-picker.c +++ b/calendar/gui/weekday-picker.c @@ -219,8 +219,9 @@ weekday_picker_realize (GtkWidget *widget) } static void -weekday_picker_size_request (GtkWidget *widget, - GtkRequisition *requisition) +weekday_picker_get_preferred_width (GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { WeekdayPicker *wp; WeekdayPickerPrivate *priv; @@ -228,8 +229,20 @@ weekday_picker_size_request (GtkWidget *widget, wp = WEEKDAY_PICKER (widget); priv = wp->priv; - requisition->width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1; - requisition->height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2); + *minimum_width = *natural_width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1; +} +static void +weekday_picker_get_preferred_height (GtkWidget *widget, + gint *minimum_height, + gint *natural_height) +{ + WeekdayPicker *wp; + WeekdayPickerPrivate *priv; + + wp = WEEKDAY_PICKER (widget); + priv = wp->priv; + + *minimum_height = *natural_height = (priv->font_ascent + priv->font_descent + 2 * PADDING + 2); } static void @@ -346,7 +359,8 @@ weekday_picker_class_init (WeekdayPickerClass *class) widget_class = GTK_WIDGET_CLASS (class); widget_class->realize = weekday_picker_realize; - widget_class->size_request = weekday_picker_size_request; + widget_class->get_preferred_width = weekday_picker_get_preferred_width; + widget_class->get_preferred_height = weekday_picker_get_preferred_height; widget_class->size_allocate = weekday_picker_size_allocate; widget_class->style_set = weekday_picker_style_set; widget_class->focus = weekday_picker_focus; |