From e48a286477d5b8d1d0f9188262e8252d5f77380b Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Tue, 17 Apr 2012 12:21:44 +0100 Subject: Work around for some missing glibmm headers in gtkmm (should be fixed in gtkmm 3.4) (bzr r11261) --- src/widgets/eek-preview.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/widgets/eek-preview.cpp') 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 = ;*/ -- cgit v1.2.3 From 45ceeba61818a931fe348da46ebb3bec3d81f994 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Tue, 17 Apr 2012 22:14:07 -0700 Subject: Fixed conditional code to avoid unused function warnings. (bzr r11262) --- src/widgets/eek-preview.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/widgets/eek-preview.cpp') diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index e03216893..db9cb96bd 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -177,6 +177,7 @@ static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req ) req->height = height; } +#if GTK_CHECK_VERSION(3,0,0) static void eek_preview_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -190,6 +191,7 @@ static void eek_preview_get_preferred_height(GtkWidget *widget, gint *minimal_he eek_preview_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif enum { CLICKED_SIGNAL, -- cgit v1.2.3