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 ++++ src/widgets/eek-preview.cpp | 2 ++ src/widgets/gradient-image.cpp | 4 ++++ src/widgets/ruler.cpp | 21 ++++++++++++++------- src/widgets/ruler.h | 4 ++-- src/widgets/sp-color-slider.cpp | 4 ++++ src/widgets/sp-widget.cpp | 4 ++++ 7 files changed, 34 insertions(+), 9 deletions(-) (limited to 'src/widgets') 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) diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index e03216893..db9cb96bd 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -177,6 +177,7 @@ static void eek_preview_size_request( GtkWidget* widget, GtkRequisition* req ) req->height = height; } +#if GTK_CHECK_VERSION(3,0,0) static void eek_preview_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -190,6 +191,7 @@ static void eek_preview_get_preferred_height(GtkWidget *widget, gint *minimal_he eek_preview_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif enum { CLICKED_SIGNAL, diff --git a/src/widgets/gradient-image.cpp b/src/widgets/gradient-image.cpp index 5beea3249..114d76293 100644 --- a/src/widgets/gradient-image.cpp +++ b/src/widgets/gradient-image.cpp @@ -29,6 +29,7 @@ static void sp_gradient_image_destroy (GtkObject *object); static void sp_gradient_image_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void sp_gradient_image_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -36,6 +37,7 @@ static void sp_gradient_image_get_preferred_width(GtkWidget *widget, static void sp_gradient_image_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static gint sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event); @@ -124,6 +126,7 @@ static void sp_gradient_image_size_request(GtkWidget * /*widget*/, GtkRequisitio requisition->height = 12; } +#if GTK_CHECK_VERSION(3,0,0) static void sp_gradient_image_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -137,6 +140,7 @@ static void sp_gradient_image_get_preferred_height(GtkWidget *widget, gint *mini sp_gradient_image_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static gint sp_gradient_image_expose (GtkWidget *widget, GdkEventExpose *event) diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index dd6ec1cc4..b4fbb13c5 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -62,6 +62,7 @@ static void gtk_deprecated_ruler_unrealize (GtkWidget *widget); static void gtk_deprecated_ruler_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void gtk_deprecated_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -69,6 +70,7 @@ static void gtk_deprecated_ruler_get_preferred_width(GtkWidget *widget, static void gtk_deprecated_ruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static void gtk_deprecated_ruler_size_allocate (GtkWidget *widget, GtkAllocation *allocation); @@ -373,16 +375,15 @@ gtk_deprecated_ruler_set_metric (GtkDeprecatedRuler *ruler, * * Return value: the units currently used for @ruler **/ -GtkMetricType -gtk_deprecated_ruler_get_metric (GtkDeprecatedRuler *ruler) +GtkMetricType gtk_deprecated_ruler_get_metric (GtkDeprecatedRuler *ruler) { - gint i; - - g_return_val_if_fail (GTK_DEPRECATED_IS_RULER (ruler), static_cast(0)); + g_return_val_if_fail(GTK_DEPRECATED_IS_RULER(ruler), static_cast(0)); - for (i = 0; i < G_N_ELEMENTS (ruler_metrics); i++) - if (ruler->metric == &ruler_metrics[i]) + for (size_t i = 0; i < G_N_ELEMENTS(ruler_metrics); i++) { + if (ruler->metric == &ruler_metrics[i]) { return static_cast(i); + } + } g_assert_not_reached (); @@ -484,6 +485,7 @@ gtk_deprecated_ruler_size_request (GtkWidget *widget, } } +#if GTK_CHECK_VERSION(3,0,0) static void gtk_deprecated_ruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -497,6 +499,7 @@ static void gtk_deprecated_ruler_get_preferred_height(GtkWidget *widget, gint *m gtk_deprecated_ruler_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void gtk_deprecated_ruler_size_allocate (GtkWidget *widget, @@ -1023,6 +1026,7 @@ static gint sp_vruler_motion_notify (GtkWidget *widget, GdkEventMotion *event); static void sp_vruler_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void sp_vruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -1030,6 +1034,7 @@ static void sp_vruler_get_preferred_width(GtkWidget *widget, static void sp_vruler_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static GtkWidgetClass *vruler_parent_class; @@ -1133,6 +1138,7 @@ sp_vruler_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->width = style->xthickness * 2 + RULER_WIDTH; } +#if GTK_CHECK_VERSION(3,0,0) static void sp_vruler_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -1146,6 +1152,7 @@ static void sp_vruler_get_preferred_height(GtkWidget *widget, gint *minimal_heig sp_vruler_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void sp_ruler_common_draw_ticks(GtkDeprecatedRuler *ruler) diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h index 03eace0cb..0e7d32b2a 100644 --- a/src/widgets/ruler.h +++ b/src/widgets/ruler.h @@ -70,8 +70,8 @@ struct _GtkDeprecatedRulerClass struct _GtkDeprecatedRulerMetric { - gchar *metric_name; - gchar *abbrev; + gchar const *metric_name; + gchar const *abbrev; /* This should be points_per_unit. This is the size of the unit * in 1/72nd's of an inch and has nothing to do with screen pixels */ gdouble pixels_per_unit; diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp index c983a4302..b5b90f951 100644 --- a/src/widgets/sp-color-slider.cpp +++ b/src/widgets/sp-color-slider.cpp @@ -33,6 +33,7 @@ static void sp_color_slider_destroy (GtkObject *object); static void sp_color_slider_realize (GtkWidget *widget); static void sp_color_slider_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void sp_color_slider_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -40,6 +41,7 @@ static void sp_color_slider_get_preferred_width(GtkWidget *widget, static void sp_color_slider_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static void sp_color_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation); /* static void sp_color_slider_draw (GtkWidget *widget, GdkRectangle *area); */ @@ -239,6 +241,7 @@ sp_color_slider_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->height = SLIDER_HEIGHT + style->ythickness * 2; } +#if GTK_CHECK_VERSION(3,0,0) static void sp_color_slider_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -252,6 +255,7 @@ static void sp_color_slider_get_preferred_height(GtkWidget *widget, gint *minima sp_color_slider_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void sp_color_slider_size_allocate (GtkWidget *widget, GtkAllocation *allocation) diff --git a/src/widgets/sp-widget.cpp b/src/widgets/sp-widget.cpp index 8225b6923..c0ee44f83 100644 --- a/src/widgets/sp-widget.cpp +++ b/src/widgets/sp-widget.cpp @@ -36,6 +36,7 @@ static void sp_widget_hide (GtkWidget *widget); static gint sp_widget_expose (GtkWidget *widget, GdkEventExpose *event); static void sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); @@ -43,6 +44,7 @@ static void sp_widget_get_preferred_width(GtkWidget *widget, static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); +#endif static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); @@ -226,6 +228,7 @@ sp_widget_size_request (GtkWidget *widget, GtkRequisition *requisition) gtk_widget_size_request (child, requisition); } +#if GTK_CHECK_VERSION(3,0,0) static void sp_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) { GtkRequisition requisition; @@ -239,6 +242,7 @@ static void sp_widget_get_preferred_height(GtkWidget *widget, gint *minimal_heig sp_widget_size_request(widget, &requisition); *minimal_height = *natural_height = requisition.height; } +#endif static void sp_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation) -- cgit v1.2.3