diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-17 11:21:44 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-04-17 11:21:44 +0000 |
| commit | e48a286477d5b8d1d0f9188262e8252d5f77380b (patch) | |
| tree | f255b920768d807c134c973649c50d5788c922f0 /src/widgets/eek-preview.cpp | |
| parent | Fix for 169888 : HIG Style frame (diff) | |
| download | inkscape-e48a286477d5b8d1d0f9188262e8252d5f77380b.tar.gz inkscape-e48a286477d5b8d1d0f9188262e8252d5f77380b.zip | |
Work around for some missing glibmm headers in gtkmm (should be fixed in gtkmm 3.4)
(bzr r11261)
Diffstat (limited to 'src/widgets/eek-preview.cpp')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index 134cf9342..e03216893 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -177,6 +177,20 @@ static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req ) req->height = height; } +static void eek_preview_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +{ + GtkRequisition requisition; + eek_preview_size_request(widget, &requisition); + *minimal_width = *natural_width = requisition.width; +} + +static void eek_preview_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) +{ + GtkRequisition requisition; + eek_preview_size_request(widget, &requisition); + *minimal_height = *natural_height = requisition.height; +} + enum { CLICKED_SIGNAL, ALTCLICKED_SIGNAL, @@ -578,7 +592,12 @@ static void eek_preview_class_init( EekPreviewClass *klass ) /*widgetClass->unmap = ;*/ /*widgetClass->realize = ;*/ /*widgetClass->unrealize = ;*/ +#if GTK_CHECK_VERSION(3,0,0) + widgetClass->get_preferred_width = eek_preview_get_preferred_width; + widgetClass->get_preferred_height = eek_preview_get_preferred_height; +#else widgetClass->size_request = eek_preview_size_request; +#endif /*widgetClass->size_allocate = ;*/ /*widgetClass->state_changed = ;*/ /*widgetClass->style_set = ;*/ |