[gtk+/wip/otte/gtk4: 98/121] switch: Remove deprecated style properties
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/otte/gtk4: 98/121] switch: Remove deprecated style properties
- Date: Fri, 7 Oct 2016 04:10:21 +0000 (UTC)
commit 2c026ae484b678f582816385e04e3cb45d85186c
Author: Timm Bäder <mail baedert org>
Date: Tue Oct 4 19:23:10 2016 +0200
switch: Remove deprecated style properties
gtk/gtkswitch.c | 72 +------------------------------------------------------
1 files changed, 1 insertions(+), 71 deletions(-)
---
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index 4b5e270..e136f67 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -72,9 +72,6 @@
#include "fallback-c89.c"
-#define DEFAULT_SLIDER_WIDTH (36)
-#define DEFAULT_SLIDER_HEIGHT (22)
-
struct _GtkSwitchPrivate
{
GdkWindow *event_window;
@@ -375,41 +372,6 @@ gtk_switch_activate (GtkSwitch *sw)
}
static void
-gtk_switch_get_slider_size (GtkCssGadget *gadget,
- GtkOrientation orientation,
- gint for_size,
- gint *minimum,
- gint *natural,
- gint *minimum_baseline,
- gint *natural_baseline,
- gpointer unused)
-{
- GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
- gdouble min_size;
-
- if (orientation == GTK_ORIENTATION_HORIZONTAL)
- {
- min_size = _gtk_css_number_value_get (gtk_css_style_get_value (gtk_css_gadget_get_style (gadget),
GTK_CSS_PROPERTY_MIN_WIDTH), 100);
-
- if (min_size > 0.0)
- *minimum = 0;
- else
- gtk_widget_style_get (widget, "slider-width", minimum, NULL);
- }
- else
- {
- min_size = _gtk_css_number_value_get (gtk_css_style_get_value (gtk_css_gadget_get_style (gadget),
GTK_CSS_PROPERTY_MIN_HEIGHT), 100);
-
- if (min_size > 0.0)
- *minimum = 0;
- else
- gtk_widget_style_get (widget, "slider-height", minimum, NULL);
- }
-
- *natural = *minimum;
-}
-
-static void
gtk_switch_get_content_size (GtkCssGadget *gadget,
GtkOrientation orientation,
gint for_size,
@@ -936,38 +898,6 @@ gtk_switch_class_init (GtkSwitchClass *klass)
klass->state_set = state_set;
/**
- * GtkSwitch:slider-width:
- *
- * The minimum width of the #GtkSwitch handle, in pixels.
- *
- * Deprecated: 3.20: Use the CSS min-width property instead.
- */
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("slider-width",
- P_("Slider Width"),
- P_("The minimum width of the handle"),
- DEFAULT_SLIDER_WIDTH, G_MAXINT,
- DEFAULT_SLIDER_WIDTH,
- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
- /**
- * GtkSwitch:slider-height:
- *
- * The minimum height of the #GtkSwitch handle, in pixels.
- *
- * Since: 3.18
- *
- * Deprecated: 3.20: Use the CSS min-height property instead.
- */
- gtk_widget_class_install_style_property (widget_class,
- g_param_spec_int ("slider-height",
- P_("Slider Height"),
- P_("The minimum height of the handle"),
- DEFAULT_SLIDER_HEIGHT, G_MAXINT,
- DEFAULT_SLIDER_HEIGHT,
- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
- /**
* GtkSwitch::activate:
* @widget: the object which received the signal.
*
@@ -1054,7 +984,7 @@ gtk_switch_init (GtkSwitch *self)
GTK_WIDGET (self),
priv->gadget,
NULL,
- gtk_switch_get_slider_size,
+ NULL,
NULL,
gtk_switch_render_slider,
NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]