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/button.cpp | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/widgets/button.cpp') diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 676cb9b59..98b9125f6 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -30,6 +30,15 @@ static void sp_button_init (SPButton *button); static void sp_button_destroy (GtkObject *object); static void sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition); + +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); + 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 +81,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 +143,20 @@ sp_button_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->height += 2 + 2 * MAX (2, style->ythickness); } +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; +} + static void sp_button_clicked (GtkButton *button) { -- 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/button.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/widgets/button.cpp') diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 98b9125f6..0071fc56e 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -31,6 +31,7 @@ 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); @@ -38,6 +39,7 @@ static void sp_button_get_preferred_width(GtkWidget *widget, 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); @@ -143,6 +145,7 @@ 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; @@ -156,6 +159,7 @@ static void sp_button_get_preferred_height(GtkWidget *widget, gint *minimal_heig sp_button_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void sp_button_clicked (GtkButton *button) -- cgit v1.2.3