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/svg-view-widget.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/svg-view-widget.cpp') diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 0e962a711..f0e366505 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -29,6 +29,14 @@ static void sp_svg_view_widget_destroy (GtkObject *object); static void sp_svg_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void sp_svg_view_widget_size_request (GtkWidget *widget, GtkRequisition *req); +static void sp_svg_view_widget_get_preferred_width(GtkWidget *widget, + gint *minimal_width, + gint *natural_width); + +static void sp_svg_view_widget_get_preferred_height(GtkWidget *widget, + gint *minimal_height, + gint *natural_height); + static void sp_svg_view_widget_view_resized (SPViewWidget *vw, Inkscape::UI::View::View *view, gdouble width, gdouble height); static SPViewWidgetClass *widget_parent_class; @@ -68,7 +76,12 @@ static void sp_svg_view_widget_class_init(SPSVGSPViewWidgetClass *klass) object_class->destroy = sp_svg_view_widget_destroy; widget_class->size_allocate = sp_svg_view_widget_size_allocate; +#if GTK_CHECK_VERSION(3,0,0) + widget_class->get_preferred_width = sp_svg_view_widget_get_preferred_width; + widget_class->get_preferred_height = sp_svg_view_widget_get_preferred_height; +#else widget_class->size_request = sp_svg_view_widget_size_request; +#endif vw_class->view_resized = sp_svg_view_widget_view_resized; } @@ -164,6 +177,20 @@ static void sp_svg_view_widget_size_request(GtkWidget *widget, GtkRequisition *r } } +static void sp_svg_view_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +{ + GtkRequisition requisition; + sp_svg_view_widget_size_request(widget, &requisition); + *minimal_width = *natural_width = requisition.width; +} + +static void sp_svg_view_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) +{ + GtkRequisition requisition; + sp_svg_view_widget_size_request(widget, &requisition); + *minimal_height = *natural_height = requisition.height; +} + /** * Callback connected with size_allocate signal. */ -- 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/svg-view-widget.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/svg-view-widget.cpp') diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index f0e366505..ac74f893f 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -29,6 +29,7 @@ static void sp_svg_view_widget_destroy (GtkObject *object); static void sp_svg_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void sp_svg_view_widget_size_request (GtkWidget *widget, GtkRequisition *req); +#if GTK_CHECK_VERSION(3,0,0) static void sp_svg_view_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -36,6 +37,7 @@ static void sp_svg_view_widget_get_preferred_width(GtkWidget *widget, static void sp_svg_view_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static void sp_svg_view_widget_view_resized (SPViewWidget *vw, Inkscape::UI::View::View *view, gdouble width, gdouble height); @@ -177,6 +179,7 @@ static void sp_svg_view_widget_size_request(GtkWidget *widget, GtkRequisition *r } } +#if GTK_CHECK_VERSION(3,0,0) static void sp_svg_view_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -190,6 +193,7 @@ static void sp_svg_view_widget_get_preferred_height(GtkWidget *widget, gint *min sp_svg_view_widget_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif /** * Callback connected with size_allocate signal. -- cgit v1.2.3