diff options
Diffstat (limited to 'src/svg-view-widget.cpp')
| -rw-r--r-- | src/svg-view-widget.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 0e962a711..ac74f893f 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -29,6 +29,16 @@ 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); + +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); static SPViewWidgetClass *widget_parent_class; @@ -68,7 +78,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 +179,22 @@ 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; + 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; +} +#endif + /** * Callback connected with size_allocate signal. */ |