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/sp-widget.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/widgets/sp-widget.cpp') diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp index 8645d90f7..8225b6923 100644 --- a/src/widgets/sp-widget.cpp +++ b/src/widgets/sp-widget.cpp @@ -35,6 +35,15 @@ static void sp_widget_show (GtkWidget *widget); static void sp_widget_hide (GtkWidget *widget); static gint sp_widget_expose (GtkWidget *widget, GdkEventExpose *event); static void sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); + +static void sp_widget_get_preferred_width(GtkWidget *widget, + gint *minimal_width, + gint *natural_width); + +static void sp_widget_get_preferred_height(GtkWidget *widget, + gint *minimal_height, + gint *natural_height); + static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void sp_widget_modify_selection (Inkscape::Application *inkscape, Inkscape::Selection *selection, guint flags, SPWidget *spw); @@ -115,7 +124,12 @@ sp_widget_class_init (SPWidgetClass *klass) widget_class->show = sp_widget_show; widget_class->hide = sp_widget_hide; widget_class->expose_event = sp_widget_expose; +#if GTK_CHECK_VERSION(3,0,0) + widget_class->get_preferred_width = sp_widget_get_preferred_width; + widget_class->get_preferred_height = sp_widget_get_preferred_height; +#else widget_class->size_request = sp_widget_size_request; +#endif widget_class->size_allocate = sp_widget_size_allocate; } @@ -212,6 +226,20 @@ sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition) gtk_widget_size_request (child, requisition); } +static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +{ + GtkRequisition requisition; + sp_widget_size_request(widget, &requisition); + *minimal_width = *natural_width = requisition.width; +} + +static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) +{ + GtkRequisition requisition; + sp_widget_size_request(widget, &requisition); + *minimal_height = *natural_height = requisition.height; +} + static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { -- 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/sp-widget.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/widgets/sp-widget.cpp') diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp index 8225b6923..c0ee44f83 100644 --- a/src/widgets/sp-widget.cpp +++ b/src/widgets/sp-widget.cpp @@ -36,6 +36,7 @@ static void sp_widget_hide (GtkWidget *widget); static gint sp_widget_expose (GtkWidget *widget, GdkEventExpose *event); static void sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -43,6 +44,7 @@ static void sp_widget_get_preferred_width(GtkWidget *widget, static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); @@ -226,6 +228,7 @@ sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition) gtk_widget_size_request (child, requisition); } +#if GTK_CHECK_VERSION(3,0,0) static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -239,6 +242,7 @@ static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_heig sp_widget_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation) -- cgit v1.2.3