From cbb995375f1b97679fd42090e31277666249cc84 Mon Sep 17 00:00:00 2001 From: Monsta Date: Sat, 12 Dec 2015 23:14:17 +0300 Subject: drop GTK+2 code and --with-gtk build option --- src/gsm_color_button.c | 182 ------------------------------------------------- 1 file changed, 182 deletions(-) (limited to 'src/gsm_color_button.c') diff --git a/src/gsm_color_button.c b/src/gsm_color_button.c index b3744ea..28dee52 100644 --- a/src/gsm_color_button.c +++ b/src/gsm_color_button.c @@ -31,9 +31,7 @@ #include #include #include -#if GTK_CHECK_VERSION(3,0,0) #include -#endif #include "gsm_color_button.h" @@ -41,19 +39,11 @@ struct _GSMColorButtonPrivate { -#if GTK_CHECK_VERSION(3,0,0) GtkWidget *cc_dialog; /* Color chooser dialog */ gchar *title; /* Title for the color selection window */ GdkRGBA color; -#else - GtkWidget *cs_dialog; /* Color selection dialog */ - - gchar *title; /* Title for the color selection window */ - - GdkColor color; -#endif gdouble fraction; /* Only used by GSMCP_TYPE_PIE */ guint type; @@ -94,13 +84,8 @@ static void gsm_color_button_get_property (GObject * object, guint param_id, GValue * value, GParamSpec * pspec); static void gsm_color_button_realize (GtkWidget * widget); -#if GTK_CHECK_VERSION(3,0,0) static void gsm_color_button_get_preferred_width (GtkWidget * widget, gint * minimum_width, gint * natural_width); static void gsm_color_button_get_preferred_height (GtkWidget * widget, gint * minimum_height, gint * natural_height); -#else -static void gsm_color_button_size_request (GtkWidget * widget, - GtkRequisition * requisition); -#endif static void gsm_color_button_size_allocate (GtkWidget * widget, GtkAllocation * allocation); static void gsm_color_button_unrealize (GtkWidget * widget); @@ -191,12 +176,8 @@ gsm_color_button_class_init (GSMColorButtonClass * klass) gobject_class->set_property = gsm_color_button_set_property; gobject_class->finalize = gsm_color_button_finalize; widget_class->state_changed = gsm_color_button_state_changed; -#if GTK_CHECK_VERSION(3,0,0) widget_class->get_preferred_width = gsm_color_button_get_preferred_width; widget_class->get_preferred_height = gsm_color_button_get_preferred_height; -#else - widget_class->size_request = gsm_color_button_size_request; -#endif widget_class->size_allocate = gsm_color_button_size_allocate; widget_class->realize = gsm_color_button_realize; widget_class->unrealize = gsm_color_button_unrealize; @@ -230,11 +211,7 @@ gsm_color_button_class_init (GSMColorButtonClass * klass) g_param_spec_boxed ("color", _("Current Color"), _("The selected color"), -#if GTK_CHECK_VERSION(3,0,0) GDK_TYPE_RGBA, -#else - GDK_TYPE_COLOR, -#endif G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -291,7 +268,6 @@ static void render (GtkWidget * widget) { GSMColorButton *color_button = GSM_COLOR_BUTTON (widget); -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA *color; GdkRGBA tmp_color = color_button->priv->color; color = &tmp_color; @@ -320,35 +296,7 @@ render (GtkWidget * widget) color->green = color->green + highlight_factor; } gdk_cairo_set_source_rgba (cr, color); -#else - GdkColor *color, tmp_color = color_button->priv->color; - color = &tmp_color; - cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget)); - cairo_path_t *path = NULL; - gint width, height; - gdouble radius, arc_start, arc_end; - gint highlight_factor; - - if (color_button->priv->highlight > 0) { - highlight_factor = 8192 * color_button->priv->highlight; - - if (color->red + highlight_factor > 65535) - color->red = 65535; - else - color->red = color->red + highlight_factor; - if (color->blue + highlight_factor > 65535) - color->blue = 65535; - else - color->blue = color->blue + highlight_factor; - - if (color->green + highlight_factor > 65535) - color->green = 65535; - else - color->green = color->green + highlight_factor; - } - gdk_cairo_set_source_color (cr, color); -#endif width = gdk_window_get_width(gtk_widget_get_window(widget)); height = gdk_window_get_height(gtk_widget_get_window(widget)); @@ -496,11 +444,7 @@ render (GtkWidget * widget) } /* Handle exposure events for the color picker's drawing area */ -#if GTK_CHECK_VERSION(3,0,0) static gboolean draw (GtkWidget * widget, cairo_t * cr, gpointer data) -#else -static gboolean expose_event (GtkWidget * widget, GdkEventExpose * event, gpointer data) -#endif { render (GTK_WIDGET (data)); @@ -514,7 +458,6 @@ gsm_color_button_realize (GtkWidget * widget) render (widget); } -#if GTK_CHECK_VERSION(3,0,0) static void gsm_color_button_get_preferred_width (GtkWidget * widget, gint * minimum_width, gint * natural_width) { g_return_if_fail (widget != NULL && minimum_width != NULL && natural_width != NULL); @@ -531,18 +474,6 @@ static void gsm_color_button_get_preferred_height (GtkWidget * widget, gint * mi *minimum_height = GSMCP_MIN_HEIGHT; *natural_height = GSMCP_MIN_HEIGHT; } -#else -static void -gsm_color_button_size_request (GtkWidget * widget, - GtkRequisition * requisition) -{ - g_return_if_fail (widget != NULL || requisition != NULL); - g_return_if_fail (GSM_IS_COLOR_BUTTON (widget)); - - requisition->width = GSMCP_MIN_WIDTH; - requisition->height = GSMCP_MIN_HEIGHT; -} -#endif static void gsm_color_button_size_allocate (GtkWidget * widget, @@ -627,25 +558,16 @@ gsm_color_button_drag_data_received (GtkWidget * widget, static void -#if GTK_CHECK_VERSION(3,0,0) set_color_icon (GdkDragContext * context, GdkRGBA * color) -#else -set_color_icon (GdkDragContext * context, GdkColor * color) -#endif { GdkPixbuf *pixbuf; guint32 pixel; pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 48, 32); -#if GTK_CHECK_VERSION(3,0,0) pixel = ((guint32)(color->red * 0xff) << 24) | ((guint32)(color->green * 0xff) << 16) | ((guint32)(color->blue * 0xff) << 8); -#else - pixel = ((color->red & 0xff00) << 16) | - ((color->green & 0xff00) << 8) | (color->blue & 0xff00); -#endif gdk_pixbuf_fill (pixbuf, pixel); @@ -717,11 +639,7 @@ gsm_color_button_init (GSMColorButton * color_button) gtk_widget_set_tooltip_text (GTK_WIDGET(color_button), _("Click to set graph colors")); -#if GTK_CHECK_VERSION(3,0,0) g_signal_connect (color_button, "draw", G_CALLBACK (draw), color_button); -#else - g_signal_connect (color_button, "expose-event", G_CALLBACK (expose_event), color_button); -#endif } static void @@ -729,15 +647,9 @@ gsm_color_button_finalize (GObject * object) { GSMColorButton *color_button = GSM_COLOR_BUTTON (object); -#if GTK_CHECK_VERSION(3,0,0) if (color_button->priv->cc_dialog != NULL) gtk_widget_destroy (color_button->priv->cc_dialog); color_button->priv->cc_dialog = NULL; -#else - if (color_button->priv->cs_dialog != NULL) - gtk_widget_destroy (color_button->priv->cs_dialog); - color_button->priv->cs_dialog = NULL; -#endif g_free (color_button->priv->title); color_button->priv->title = NULL; @@ -749,11 +661,7 @@ gsm_color_button_finalize (GObject * object) } GtkWidget * -#if GTK_CHECK_VERSION(3,0,0) gsm_color_button_new (const GdkRGBA * color, guint type) -#else -gsm_color_button_new (const GdkColor * color, guint type) -#endif { return g_object_new (GSM_TYPE_COLOR_BUTTON, "color", color, "type", type, NULL); @@ -763,7 +671,6 @@ static void dialog_response (GtkWidget * widget, GtkResponseType response, gpointer data) { GSMColorButton *color_button = GSM_COLOR_BUTTON (data); -#if GTK_CHECK_VERSION(3,0,0) GtkColorChooser *color_chooser; if (response == GTK_RESPONSE_OK) { @@ -772,19 +679,6 @@ dialog_response (GtkWidget * widget, GtkResponseType response, gpointer data) gtk_color_chooser_get_rgba (color_chooser, &color_button->priv->color); gtk_widget_hide (color_button->priv->cc_dialog); -#else - GtkColorSelection *color_selection; - - if (response == GTK_RESPONSE_OK) { - color_selection = - GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (GTK_COLOR_SELECTION_DIALOG - (color_button->priv->cs_dialog))); - - gtk_color_selection_get_current_color (color_selection, - &color_button->priv->color); - - gtk_widget_hide (color_button->priv->cs_dialog); -#endif gtk_widget_queue_draw (GTK_WIDGET (&color_button->widget)); @@ -795,11 +689,7 @@ dialog_response (GtkWidget * widget, GtkResponseType response, gpointer data) g_object_thaw_notify (G_OBJECT (color_button)); } else /* (response == GTK_RESPONSE_CANCEL) */ -#if GTK_CHECK_VERSION(3,0,0) gtk_widget_hide (color_button->priv->cc_dialog); -#else - gtk_widget_hide (color_button->priv->cs_dialog); -#endif } static gboolean @@ -807,11 +697,7 @@ dialog_destroy (GtkWidget * widget, gpointer data) { GSMColorButton *color_button = GSM_COLOR_BUTTON (data); -#if GTK_CHECK_VERSION(3,0,0) color_button->priv->cc_dialog = NULL; -#else - color_button->priv->cs_dialog = NULL; -#endif return FALSE; } @@ -820,7 +706,6 @@ static gint gsm_color_button_clicked (GtkWidget * widget, GdkEventButton * event) { GSMColorButton *color_button = GSM_COLOR_BUTTON (widget); -#if GTK_CHECK_VERSION(3,0,0) /* if dialog already exists, make sure it's shown and raised */ if (!color_button->priv->cc_dialog) @@ -850,53 +735,7 @@ gsm_color_button_clicked (GtkWidget * widget, GdkEventButton * event) &color_button->priv->color); gtk_window_present (GTK_WINDOW (color_button->priv->cc_dialog)); -#else - GtkColorSelectionDialog *color_dialog; - - /* if dialog already exists, make sure it's shown and raised */ - if (!color_button->priv->cs_dialog) - { - /* Create the dialog and connects its buttons */ - GtkWidget *parent; - - parent = gtk_widget_get_toplevel (GTK_WIDGET (color_button)); - - color_button->priv->cs_dialog = - gtk_color_selection_dialog_new (color_button->priv->title); - - color_dialog = - GTK_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog); - - if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent)) - { - if (GTK_WINDOW (parent) != - gtk_window_get_transient_for (GTK_WINDOW (color_dialog))) - gtk_window_set_transient_for (GTK_WINDOW (color_dialog), - GTK_WINDOW (parent)); - - gtk_window_set_modal (GTK_WINDOW (color_dialog), - gtk_window_get_modal (GTK_WINDOW (parent))); - } - - g_signal_connect (color_dialog, "response", - G_CALLBACK (dialog_response), color_button); - - g_signal_connect (color_dialog, "destroy", - G_CALLBACK (dialog_destroy), color_button); - } - - color_dialog = GTK_COLOR_SELECTION_DIALOG (color_button->priv->cs_dialog); - - gtk_color_selection_set_previous_color (GTK_COLOR_SELECTION - (gtk_color_selection_dialog_get_color_selection (color_dialog)), - &color_button->priv->color); - - gtk_color_selection_set_current_color (GTK_COLOR_SELECTION - (gtk_color_selection_dialog_get_color_selection (color_dialog)), - &color_button->priv->color); - gtk_window_present (GTK_WINDOW (color_button->priv->cs_dialog)); -#endif return 0; } @@ -984,29 +823,19 @@ gsm_color_button_set_fraction (GSMColorButton * color_button, } void -#if GTK_CHECK_VERSION(3,0,0) gsm_color_button_get_color (GSMColorButton * color_button, GdkRGBA * color) -#else -gsm_color_button_get_color (GSMColorButton * color_button, GdkColor * color) -#endif { g_return_if_fail (GSM_IS_COLOR_BUTTON (color_button)); color->red = color_button->priv->color.red; color->green = color_button->priv->color.green; color->blue = color_button->priv->color.blue; -#if GTK_CHECK_VERSION(3,0,0) color->alpha = color_button->priv->color.alpha; -#endif } void gsm_color_button_set_color (GSMColorButton * color_button, -#if GTK_CHECK_VERSION(3,0,0) const GdkRGBA * color) -#else - const GdkColor * color) -#endif { g_return_if_fail (GSM_IS_COLOR_BUTTON (color_button)); g_return_if_fail (color != NULL); @@ -1014,9 +843,7 @@ gsm_color_button_set_color (GSMColorButton * color_button, color_button->priv->color.red = color->red; color_button->priv->color.green = color->green; color_button->priv->color.blue = color->blue; -#if GTK_CHECK_VERSION(3,0,0) color_button->priv->color.alpha = color->alpha; -#endif gtk_widget_queue_draw (GTK_WIDGET (&color_button->widget)); //->priv->draw_area); @@ -1035,13 +862,8 @@ gsm_color_button_set_title (GSMColorButton * color_button, color_button->priv->title = g_strdup (title); g_free (old_title); -#if GTK_CHECK_VERSION(3,0,0) if (color_button->priv->cc_dialog) gtk_window_set_title (GTK_WINDOW (color_button->priv->cc_dialog), -#else - if (color_button->priv->cs_dialog) - gtk_window_set_title (GTK_WINDOW (color_button->priv->cs_dialog), -#endif color_button->priv->title); g_object_notify (G_OBJECT (color_button), "title"); @@ -1088,11 +910,7 @@ gsm_color_button_get_property (GObject * object, GValue * value, GParamSpec * pspec) { GSMColorButton *color_button = GSM_COLOR_BUTTON (object); -#if GTK_CHECK_VERSION(3,0,0) GdkRGBA color; -#else - GdkColor color; -#endif switch (param_id) { -- cgit v1.2.1