diff options
| author | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-04-26 11:14:34 +0000 |
| commit | 95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4 (patch) | |
| tree | 506de5a8437cb39917a66d74b68d78692d10a993 /src/widgets/button.cpp | |
| parent | Added first support for elliptical arrangements (diff) | |
| parent | powerstroke: cautious fix. (diff) | |
| download | inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.tar.gz inkscape-95a8ad7bfec98f7cede15c4e8856ce547aaf4aa4.zip | |
Trunk merge
(bzr r11073.1.20)
Diffstat (limited to 'src/widgets/button.cpp')
| -rw-r--r-- | src/widgets/button.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 676cb9b59..0071fc56e 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -30,6 +30,17 @@ static void sp_button_init (SPButton *button); static void sp_button_destroy (GtkObject *object); static void sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition); + +#if GTK_CHECK_VERSION(3,0,0) +static void sp_button_get_preferred_width(GtkWidget *widget, + gint *minimal_width, + gint *natural_width); + +static void sp_button_get_preferred_height(GtkWidget *widget, + gint *minimal_height, + gint *natural_height); +#endif + static void sp_button_clicked (GtkButton *button); static void sp_button_perform_action (SPButton *button, gpointer data); static gint sp_button_process_event (SPButton *button, GdkEvent *event); @@ -72,7 +83,12 @@ sp_button_class_init (SPButtonClass *klass) parent_class = (GtkToggleButtonClass *)g_type_class_peek_parent (klass); object_class->destroy = sp_button_destroy; +#if GTK_CHECK_VERSION(3,0,0) + widget_class->get_preferred_width = sp_button_get_preferred_width; + widget_class->get_preferred_height = sp_button_get_preferred_height; +#else widget_class->size_request = sp_button_size_request; +#endif button_class->clicked = sp_button_clicked; } @@ -129,6 +145,22 @@ sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->height += 2 + 2 * MAX (2, style->ythickness); } +#if GTK_CHECK_VERSION(3,0,0) +static void sp_button_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) +{ + GtkRequisition requisition; + sp_button_size_request(widget, &requisition); + *minimal_width = *natural_width = requisition.width; +} + +static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) +{ + GtkRequisition requisition; + sp_button_size_request(widget, &requisition); + *minimal_height = *natural_height = requisition.height; +} +#endif + static void sp_button_clicked (GtkButton *button) { |