[gtk+/wip/baedert/box: 5/7] Remove various sizing related style properties



commit 7312251d3fc819e7a1a0876db2482d216551d23d
Author: Timm Bäder <mail baedert org>
Date:   Tue Oct 4 19:53:36 2016 +0200

    Remove various sizing related style properties

 gtk/gtkbuiltinicon.c        |   46 +---------
 gtk/gtkbuiltiniconprivate.h |    3 -
 gtk/gtkcheckbutton.c        |   17 ---
 gtk/gtkexpander.c           |   17 ---
 gtk/gtklevelbar.c           |   35 -------
 gtk/gtkmenu.c               |   17 ---
 gtk/gtkmenuitem.c           |   33 ------
 gtk/gtknotebook.c           |    4 -
 gtk/gtkpaned.c              |   16 ---
 gtk/gtkprogressbar.c        |  231 +------------------------------------------
 gtk/gtkrange.c              |   49 ---------
 gtk/gtkspinbutton.c         |   16 ---
 12 files changed, 3 insertions(+), 481 deletions(-)
---
diff --git a/gtk/gtkbuiltinicon.c b/gtk/gtkbuiltinicon.c
index feedb2c..8a2c7d3 100644
--- a/gtk/gtkbuiltinicon.c
+++ b/gtk/gtkbuiltinicon.c
@@ -35,8 +35,7 @@
  * is rendered.
  *
  * Use gtk_builtin_icon_set_default_size to set a non-zero default
- * size for the icon. If you need to support a legacy size style property,
- * use gtk_builtin_icon_set_default_size_property.
+ * size for the icon.
  *
  * Themes can override the acutal image that is used with the
  * -gtk-icon-source property. If it is not specified, a builtin
@@ -292,46 +291,3 @@ gtk_builtin_icon_get_default_size (GtkBuiltinIcon *icon)
 
   return priv->default_size;
 }
-
-/**
- * gtk_builtin_icon_set_default_size_property:
- * @icon: icon to set the property for
- * @property_name: Name of the style property
- *
- * Sets the name of a widget style property to use to compute the default size
- * of the icon. If it is set to no %NULL, it will be used instead of the value
- * set via gtk_builtin_icon_set_default_size() to set the default size of the
- * icon.
- *
- * @property_name must refer to a style property that is of integer type.
- *
- * This function is intended strictly for backwards compatibility reasons.
- */
-void
-gtk_builtin_icon_set_default_size_property (GtkBuiltinIcon *icon,
-                                            const char     *property_name)
-{
-  GtkBuiltinIconPrivate *priv;
-  
-  g_return_if_fail (GTK_IS_BUILTIN_ICON (icon));
-
-  priv = gtk_builtin_icon_get_instance_private (icon);
-
-  if (g_strcmp0 (priv->default_size_property, property_name))
-    {
-      priv->default_size_property = g_strdup (property_name);
-      gtk_widget_queue_resize (gtk_css_gadget_get_owner (GTK_CSS_GADGET (icon)));
-    }
-}
-
-const char *
-gtk_builtin_icon_get_default_size_property (GtkBuiltinIcon *icon)
-{
-  GtkBuiltinIconPrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_BUILTIN_ICON (icon), NULL);
-
-  priv = gtk_builtin_icon_get_instance_private (icon);
-
-  return priv->default_size_property;
-}
diff --git a/gtk/gtkbuiltiniconprivate.h b/gtk/gtkbuiltiniconprivate.h
index 7aa7e35..5da73ef 100644
--- a/gtk/gtkbuiltiniconprivate.h
+++ b/gtk/gtkbuiltiniconprivate.h
@@ -59,9 +59,6 @@ GtkCssImageBuiltinType  gtk_builtin_icon_get_image              (GtkBuiltinIcon
 void                    gtk_builtin_icon_set_default_size       (GtkBuiltinIcon         *icon,
                                                                  int                     default_size);
 int                     gtk_builtin_icon_get_default_size       (GtkBuiltinIcon         *icon);
-void                    gtk_builtin_icon_set_default_size_property (GtkBuiltinIcon      *icon,
-                                                                 const char             *property_name);
-const char *            gtk_builtin_icon_get_default_size_property (GtkBuiltinIcon      *icon);
 
 G_END_DECLS
 
diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
index 8b48463..6cb6446 100644
--- a/gtk/gtkcheckbutton.c
+++ b/gtk/gtkcheckbutton.c
@@ -221,22 +221,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
   container_class->remove = gtk_check_button_remove;
 
   /**
-   * GtkCheckButton:indicator-size:
-   *
-   * The size of the indicator.
-   *
-   * Deprecated: 3.20: Use CSS min-width and min-height on the indicator node.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("indicator-size",
-                                                            P_("Indicator Size"),
-                                                            P_("Size of check or radio indicator"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            INDICATOR_SIZE,
-                                                            GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-  /**
    * GtkCheckButton:indicator-spacing:
    *
    * The spacing around the indicator.
@@ -320,7 +304,6 @@ gtk_check_button_init (GtkCheckButton *check_button)
                                                  GTK_WIDGET (check_button),
                                                  priv->gadget,
                                                  NULL);
-  gtk_builtin_icon_set_default_size_property (GTK_BUILTIN_ICON (priv->indicator_gadget), "indicator-size");
   gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->gadget), 0, priv->indicator_gadget, FALSE, 
GTK_ALIGN_BASELINE);
 
   gtk_check_button_update_node_state (GTK_WIDGET (check_button));
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index ad84d5f..0bc124e 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -374,22 +374,6 @@ gtk_expander_class_init (GtkExpanderClass *klass)
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   /**
-   * GtkExpander:expander-size:
-   *
-   * The size of the expander arrow.
-   *
-   * Deprecated: 3.20: Use CSS min-width and min-height instead.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("expander-size",
-                                                             P_("Expander Size"),
-                                                             P_("Size of the expander arrow"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             DEFAULT_EXPANDER_SIZE,
-                                                             GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-  /**
    * GtkExpander:expander-spacing:
    *
    * Spaing around the expander arrow.
@@ -458,7 +442,6 @@ gtk_expander_init (GtkExpander *expander)
                                              priv->title_gadget,
                                              NULL);
   gtk_css_gadget_add_class (priv->arrow_gadget, GTK_STYLE_CLASS_HORIZONTAL);
-  gtk_builtin_icon_set_default_size_property (GTK_BUILTIN_ICON (priv->arrow_gadget), "expander-size");
 
   gtk_box_gadget_insert_gadget (GTK_BOX_GADGET (priv->title_gadget), -1, priv->arrow_gadget, FALSE, 
GTK_ALIGN_CENTER);
 
diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
index 1081a82..709b7d4 100644
--- a/gtk/gtklevelbar.c
+++ b/gtk/gtklevelbar.c
@@ -1089,41 +1089,6 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
                           FALSE,
                           G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
 
-  /**
-   * GtkLevelBar:min-block-height:
-   *
-   * The min-block-height style property determines the minimum
-   * height for blocks filling the #GtkLevelBar widget.
-   *
-   * Since: 3.6
-   *
-   * Deprecated: 3.20: Use the standard min-width/min-height CSS properties on
-   *   the block elements; the value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property
-    (wclass, g_param_spec_int ("min-block-height",
-                               P_("Minimum height for filling blocks"),
-                               P_("Minimum height for blocks that fill the bar"),
-                               1, G_MAXINT, DEFAULT_BLOCK_SIZE,
-                               G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-  /**
-   * GtkLevelBar:min-block-width:
-   *
-   * The min-block-width style property determines the minimum
-   * width for blocks filling the #GtkLevelBar widget.
-   *
-   * Since: 3.6
-   *
-   * Deprecated: 3.20: Use the standard min-width/min-height CSS properties on
-   *   the block elements; the value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property
-    (wclass, g_param_spec_int ("min-block-width",
-                               P_("Minimum width for filling blocks"),
-                               P_("Minimum width for blocks that fill the bar"),
-                               1, G_MAXINT, DEFAULT_BLOCK_SIZE,
-                               G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-
   g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
 
   gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE);
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 7bb3709..0f570f0 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -987,23 +987,6 @@ gtk_menu_class_init (GtkMenuClass *class)
                                                                 -1, INT_MAX, -1,
                                                                GTK_PARAM_READWRITE));
 
- /**
-  * GtkMenu:arrow-scaling:
-  *
-  * Arbitrary constant to scale down the size of the scroll arrow.
-  *
-  * Since: 2.16
-  *
-  * Deprecated: 3.20: use the standard min-width/min-height CSS properties on
-  *   the arrow node; the value of this style property is ignored.
-  */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_float ("arrow-scaling",
-                                                               P_("Arrow Scaling"),
-                                                               P_("Arbitrary constant to scale down the size 
of the scroll arrow"),
-                                                               0.0, 1.0, 0.7,
-                                                               GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
   binding_set = gtk_binding_set_by_class (class);
   gtk_binding_entry_add_signal (binding_set,
                                 GDK_KEY_Up, 0,
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 09f7d54..5988843 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -882,39 +882,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
                                                              10,
                                                              GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
 
-  /**
-   * GtkMenuItem:arrow-scaling:
-   *
-   * Amount of space used up by the arrow, relative to the menu item's font
-   * size.
-   *
-   * Deprecated: 3.20: use the standard min-width/min-height CSS properties on
-   *   the arrow node; the value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_float ("arrow-scaling",
-                                                               P_("Arrow Scaling"),
-                                                               P_("Amount of space used up by arrow, 
relative to the menu item's font size"),
-                                                               0.0, 2.0, 0.8,
-                                                               GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-  /**
-   * GtkMenuItem:width-chars:
-   *
-   * The minimum desired width of the menu item in characters.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use the standard CSS property min-width; the value of
-   *     this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("width-chars",
-                                                             P_("Width in Characters"),
-                                                             P_("The minimum desired width of the menu item 
in characters"),
-                                                             0, G_MAXINT, 12,
-                                                             GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "menuitem");
 
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 29e5b31..08c102e 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3486,7 +3486,6 @@ update_arrow_nodes (GtkNotebook *notebook)
   GtkNotebookPrivate *priv = notebook->priv;
   gboolean arrow[4];
   GtkCssImageBuiltinType up_image_type, down_image_type;
-  const char *style_property_name;
   GtkCssNode *tabs_node;
   gint i;
  
@@ -3497,13 +3496,11 @@ update_arrow_nodes (GtkNotebook *notebook)
     {
       up_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_UP;
       down_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN;
-      style_property_name = "scroll-arrow-vlength";
     }
   else
     {
       up_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT;
       down_image_type = GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT;
-      style_property_name = "scroll-arrow-hlength";
     }
 
   gtk_widget_style_get (GTK_WIDGET (notebook),
@@ -3576,7 +3573,6 @@ update_arrow_nodes (GtkNotebook *notebook)
           else
             gtk_builtin_icon_set_image (GTK_BUILTIN_ICON (priv->arrow_gadget[i]), up_image_type);
           
-          gtk_builtin_icon_set_default_size_property (GTK_BUILTIN_ICON (priv->arrow_gadget[i]), 
style_property_name);
         }
       else
         {
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index dbde5bd..d66f2b1 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -430,22 +430,6 @@ gtk_paned_class_init (GtkPanedClass *class)
                                                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
   /**
-   * GtkPaned::handle-size:
-   *
-   * The width of the handle.
-   *
-   * Deprecated: 3.20: Use CSS min-width and min-height instead.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("handle-size",
-                                                            P_("Handle Size"),
-                                                            P_("Width of handle"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            5,
-                                                            GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-  /**
    * GtkPaned:resize:
    *
    * The "resize" child property determines whether the child expands and
diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index d4f8ee1..7056a31 100644
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -194,14 +194,6 @@ static void     gtk_progress_bar_allocate_trough   (GtkCssGadget        *gadget,
                                                     gint                 baseline,
                                                     GtkAllocation       *out_clip,
                                                     gpointer             data);
-static void     gtk_progress_bar_measure_trough    (GtkCssGadget        *gadget,
-                                                    GtkOrientation       orientation,
-                                                    gint                 for_size,
-                                                    gint                *minimum,
-                                                    gint                *natural,
-                                                    gint                *minimum_baseline,
-                                                    gint                *natural_baseline,
-                                                    gpointer             data);
 static gboolean gtk_progress_bar_render_trough     (GtkCssGadget        *gadget,
                                                     cairo_t             *cr,
                                                     gint                 x,
@@ -209,14 +201,6 @@ static gboolean gtk_progress_bar_render_trough     (GtkCssGadget        *gadget,
                                                     gint                 width,
                                                     gint                 height,
                                                     gpointer             data);
-static void     gtk_progress_bar_measure_progress  (GtkCssGadget        *gadget,
-                                                    GtkOrientation       orientation,
-                                                    gint                 for_size,
-                                                    gint                *minimum,
-                                                    gint                *natural,
-                                                    gint                *minimum_baseline,
-                                                    gint                *natural_baseline,
-                                                    gpointer             data);
 static void     gtk_progress_bar_measure_text      (GtkCssGadget        *gadget,
                                                     GtkOrientation       orientation,
                                                     gint                 for_size,
@@ -336,97 +320,6 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
 
   g_object_class_install_properties (gobject_class, NUM_PROPERTIES, progress_props);
 
-  /**
-   * GtkProgressBar:xspacing:
-   *
-   * Extra spacing applied to the width of a progress bar.
-   *
-   * Deprecated: 3.20: Use the standard CSS padding and margins; the
-   *     value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("xspacing",
-                                                             P_("X spacing"),
-                                                             P_("Extra spacing applied to the width of a 
progress bar."),
-                                                             0, G_MAXINT, 2,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-
-  /**
-   * GtkProgressBar:yspacing:
-   *
-   * Extra spacing applied to the height of a progress bar.
-   *
-   * Deprecated: 3.20: Use the standard CSS padding and margins; the
-   *     value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("yspacing",
-                                                             P_("Y spacing"),
-                                                             P_("Extra spacing applied to the height of a 
progress bar."),
-                                                             0, G_MAXINT, 2,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-
-  /**
-   * GtkProgressBar:min-horizontal-bar-width:
-   *
-   * The minimum horizontal width of the progress bar.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use the standard CSS property min-width.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("min-horizontal-bar-width",
-                                                             P_("Minimum horizontal bar width"),
-                                                             P_("The minimum horizontal width of the 
progress bar"),
-                                                             1, G_MAXINT, MIN_HORIZONTAL_BAR_WIDTH,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-  /**
-   * GtkProgressBar:min-horizontal-bar-height:
-   *
-   * Minimum horizontal height of the progress bar.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use the standard CSS property min-height.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("min-horizontal-bar-height",
-                                                             P_("Minimum horizontal bar height"),
-                                                             P_("Minimum horizontal height of the progress 
bar"),
-                                                             1, G_MAXINT, MIN_HORIZONTAL_BAR_HEIGHT,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-  /**
-   * GtkProgressBar:min-vertical-bar-width:
-   *
-   * The minimum vertical width of the progress bar.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use the standard CSS proeprty min-width.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("min-vertical-bar-width",
-                                                             P_("Minimum vertical bar width"),
-                                                             P_("The minimum vertical width of the progress 
bar"),
-                                                             1, G_MAXINT, MIN_VERTICAL_BAR_WIDTH,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-  /**
-   * GtkProgressBar:min-vertical-bar-height:
-   *
-   * The minimum vertical height of the progress bar.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use the standard CSS property min-height.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("min-vertical-bar-height",
-                                                             P_("Minimum vertical bar height"),
-                                                             P_("The minimum vertical height of the progress 
bar"),
-                                                             1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
-                                                             G_PARAM_READWRITE|G_PARAM_DEPRECATED));
-
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_PROGRESS_BAR_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "progressbar");
 }
@@ -554,7 +447,7 @@ gtk_progress_bar_init (GtkProgressBar *pbar)
                                                    GTK_WIDGET (pbar),
                                                    priv->gadget,
                                                    NULL,
-                                                   gtk_progress_bar_measure_trough,
+                                                   NULL,
                                                    gtk_progress_bar_allocate_trough,
                                                    gtk_progress_bar_render_trough,
                                                    NULL,
@@ -564,7 +457,7 @@ gtk_progress_bar_init (GtkProgressBar *pbar)
                                                      GTK_WIDGET (pbar),
                                                      priv->trough_gadget,
                                                      NULL,
-                                                     gtk_progress_bar_measure_progress,
+                                                     NULL,
                                                      NULL,
                                                      NULL,
                                                      NULL,
@@ -844,126 +737,6 @@ gtk_progress_bar_measure_text (GtkCssGadget   *gadget,
   g_object_unref (layout);
 }
 
-static gint
-get_number (GtkCssStyle *style,
-            guint        property)
-{
-  double d = _gtk_css_number_value_get (gtk_css_style_get_value (style, property), 100.0);
-
-  if (d < 1)
-    return ceil (d);
-  else
-    return floor (d);
-}
-
-static void
-gtk_progress_bar_measure_trough (GtkCssGadget   *gadget,
-                                 GtkOrientation  orientation,
-                                 int             for_size,
-                                 int            *minimum,
-                                 int            *natural,
-                                 int            *minimum_baseline,
-                                 int            *natural_baseline,
-                                 gpointer        data)
-{
-  GtkWidget *widget;
-  GtkProgressBarPrivate *priv;
-  GtkCssStyle *style;
-
-  widget = gtk_css_gadget_get_owner (gadget);
-  priv = GTK_PROGRESS_BAR (widget)->priv;
-
-  style = gtk_css_gadget_get_style (gadget);
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      gdouble min_width;
-
-      min_width = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_MIN_WIDTH), 
100.0);
-
-      if (min_width > 0.0)
-        *minimum = 0;
-      else if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        gtk_widget_style_get (widget, "min-horizontal-bar-width", minimum, NULL);
-      else
-        gtk_widget_style_get (widget, "min-vertical-bar-width", minimum, NULL);
-    }
-  else
-    {
-      gdouble min_height;
-
-      min_height = _gtk_css_number_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_MIN_HEIGHT), 
100.0);
-
-      if (min_height > 0.0)
-        *minimum = 0;
-      else if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        gtk_widget_style_get (widget, "min-horizontal-bar-height", minimum, NULL);
-      else
-        gtk_widget_style_get (widget, "min-vertical-bar-height", minimum, NULL);
-    }
-
-  *natural = *minimum;
-
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-  if (natural_baseline)
-    *natural_baseline = -1;
-}
-
-static void
-gtk_progress_bar_measure_progress (GtkCssGadget   *gadget,
-                                   GtkOrientation  orientation,
-                                   int             for_size,
-                                   int            *minimum,
-                                   int            *natural,
-                                   int            *minimum_baseline,
-                                   int            *natural_baseline,
-                                   gpointer        data)
-{
-  GtkWidget *widget;
-  GtkProgressBar *pbar;
-  GtkProgressBarPrivate *priv;
-  GtkCssStyle *style;
-
-  widget = gtk_css_gadget_get_owner (gadget);
-  pbar = GTK_PROGRESS_BAR (widget);
-  priv = pbar->priv;
-
-  style = gtk_css_gadget_get_style (gadget);
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      gint min_width;
-
-      min_width = get_number (style, GTK_CSS_PROPERTY_MIN_WIDTH);
-
-      if (min_width != 0)
-        *minimum = min_width;
-      else if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        *minimum = 0;
-      else
-        gtk_widget_style_get (widget, "min-vertical-bar-width", minimum, NULL);
-    }
-  else
-    {
-      gint min_height;
-
-      min_height = get_number (style, GTK_CSS_PROPERTY_MIN_HEIGHT);
-
-      if (min_height != 0)
-        *minimum = min_height;
-      else if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-        *minimum = 0;
-      else
-        gtk_widget_style_get (widget, "min-horizontal-bar-height", minimum, NULL);
-    }
-
-  *natural = *minimum;
-
-  if (minimum_baseline)
-    *minimum_baseline = -1;
-  if (natural_baseline)
-    *natural_baseline = -1;
-}
-
 static void
 gtk_progress_bar_size_allocate (GtkWidget     *widget,
                                 GtkAllocation *allocation)
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index ad86c0d..8ce5ee9 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -527,22 +527,6 @@ gtk_range_class_init (GtkRangeClass *class)
   g_object_class_install_properties (gobject_class, LAST_PROP, properties);
 
   /**
-   * GtkRange:slider-width:
-   *
-   * Width of scrollbar or scale thumb.
-   *
-   * Deprecated: 3.20: Use the min-height/min-width CSS properties on the
-   *   slider element. The value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("slider-width",
-                                                            P_("Slider Width"),
-                                                            P_("Width of scrollbar or scale thumb"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            14,
-                                                            GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-  /**
    * GtkRange:trough-border:
    *
    * Spacing between thumb/steppers and outer trough bevel.
@@ -559,22 +543,6 @@ gtk_range_class_init (GtkRangeClass *class)
                                                              1,
                                                              GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
   /**
-   * GtkRange:stepper-size:
-   *
-   * Length of step buttons at ends.
-   *
-   * Deprecated: 3.20: Use the min-height/min-width CSS properties on the
-   *   stepper elements. The value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("stepper-size",
-                                                            P_("Stepper Size"),
-                                                            P_("Length of step buttons at ends"),
-                                                            0,
-                                                            G_MAXINT,
-                                                            14,
-                                                            GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-  /**
    * GtkRange:stepper-spacing:
    *
    * The spacing between the stepper buttons and thumb. Note that
@@ -642,23 +610,6 @@ gtk_range_class_init (GtkRangeClass *class)
                                                                  TRUE,
                                                                  GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
 
-  /**
-   * GtkRange:arrow-scaling:
-   *
-   * The arrow size proportion relative to the scroll button size.
-   *
-   * Since: 2.14
-   *
-   * Deprecated: 3.20: Use min-width/min-height on the "button" node instead.
-   *   The value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_float ("arrow-scaling",
-                                                              P_("Arrow scaling"),
-                                                              P_("Arrow scaling with regard to scroll button 
size"),
-                                                              0.0, 1.0, 0.5,
-                                                              GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RANGE_ACCESSIBLE);
 }
 
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9e5e4c7..d774b9d 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -440,22 +440,6 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
                                     "orientation");
 
   /**
-   * GtkSpinButton:shadow-type:
-   *
-   * Style of bevel around the sping button.
-   *
-   * Deprecated: 3.20: Use CSS to determine the style of the border;
-   *     the value of this style property is ignored.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_enum ("shadow-type",
-                                                              P_("Shadow Type"),
-                                                              P_("Style of bevel around the spin button"),
-                                                              GTK_TYPE_SHADOW_TYPE,
-                                                              GTK_SHADOW_IN,
-                                                              GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
-
-  /**
    * GtkSpinButton::input:
    * @spin_button: the object on which the signal was emitted
    * @new_value: (out) (type double): return location for the new value


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]