diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2012-04-18 05:14:07 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2012-04-18 05:14:07 +0000 |
| commit | 45ceeba61818a931fe348da46ebb3bec3d81f994 (patch) | |
| tree | 999dac3280a9a5ea177fe53af52acc8e34cc2193 /src/widgets/button.cpp | |
| parent | Work around for some missing glibmm headers in gtkmm (should be fixed in gtkm... (diff) | |
| download | inkscape-45ceeba61818a931fe348da46ebb3bec3d81f994.tar.gz inkscape-45ceeba61818a931fe348da46ebb3bec3d81f994.zip | |
Fixed conditional code to avoid unused function warnings.
(bzr r11262)
Diffstat (limited to '')
| -rw-r--r-- | src/widgets/button.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) |