[gtk+/gtk-3-14] render: We use CHECKED now, not ACTIVE



commit 989330a9fdad0609b09a82702333ca92683a8b92
Author: Benjamin Otte <otte redhat com>
Date:   Tue Oct 21 05:58:02 2014 +0200

    render: We use CHECKED now, not ACTIVE
    
    Update docs and custom rendering of checkmarks and radio buttons

 gtk/deprecated/gtkthemingengine.c |    4 ++--
 gtk/gtkstylecontext.c             |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/deprecated/gtkthemingengine.c b/gtk/deprecated/gtkthemingengine.c
index 9248b90..0f4aa53 100644
--- a/gtk/deprecated/gtkthemingengine.c
+++ b/gtk/deprecated/gtkthemingengine.c
@@ -1177,7 +1177,7 @@ gtk_theming_engine_render_check (GtkThemingEngine *engine,
     }
   else
     {
-      if (flags & GTK_STATE_FLAG_ACTIVE)
+      if (flags & GTK_STATE_FLAG_CHECKED)
         {
           cairo_translate (cr,
                            x + pad, y + pad);
@@ -1301,7 +1301,7 @@ gtk_theming_engine_render_option (GtkThemingEngine *engine,
                        line_thickness);
       cairo_fill (cr);
     }
-  if (flags & GTK_STATE_FLAG_ACTIVE)
+  if (flags & GTK_STATE_FLAG_CHECKED)
     {
       pad = thickness + MAX (1, 2 * (exterior_size - 2 * thickness) / 9);
       interior_size = MAX (1, exterior_size - 2 * pad);
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index b928b22..92d7023 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3535,7 +3535,7 @@ _gtk_style_context_get_cursor_color (GtkStyleContext *context,
  *
  * Renders a checkmark (as in a #GtkCheckButton).
  *
- * The %GTK_STATE_FLAG_ACTIVE state determines whether the check is
+ * The %GTK_STATE_FLAG_CHECKED state determines whether the check is
  * on or off, and %GTK_STATE_FLAG_INCONSISTENT determines whether it
  * should be marked as undefined.
  *
@@ -3585,7 +3585,7 @@ gtk_render_check (GtkStyleContext *context,
  * @width: rectangle width
  * @height: rectangle height
  *
- * Renders an option mark (as in a #GtkRadioButton), the %GTK_STATE_FLAG_ACTIVE
+ * Renders an option mark (as in a #GtkRadioButton), the %GTK_STATE_FLAG_CHECKED
  * state will determine whether the option is on or off, and
  * %GTK_STATE_FLAG_INCONSISTENT whether it should be marked as undefined.
  *
@@ -3780,7 +3780,7 @@ gtk_render_frame (GtkStyleContext *context,
  * @height: rectangle height
  *
  * Renders an expander (as used in #GtkTreeView and #GtkExpander) in the area
- * defined by @x, @y, @width, @height. The state %GTK_STATE_FLAG_ACTIVE
+ * defined by @x, @y, @width, @height. The state %GTK_STATE_FLAG_CHECKED
  * determines whether the expander is collapsed or expanded.
  *
  * Typical expander rendering:
@@ -4164,7 +4164,7 @@ gtk_render_handle (GtkStyleContext *context,
  * @height: rectangle height
  *
  * Renders an activity indicator (such as in #GtkSpinner).
- * The state %GTK_STATE_FLAG_ACTIVE determines whether there is
+ * The state %GTK_STATE_FLAG_CHECKED determines whether there is
  * activity going on.
  *
  * Since: 3.0


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