From 238fd52c4b0660ac61b3ae125f3eef8f71b0f6b0 Mon Sep 17 00:00:00 2001
From: Elliot Smith <elliot.smith@intel.com>
Date: Fri, 28 Jan 2011 17:09:24 +0000
Subject: [PATCH] docs: Change order of functions in example to match docs

Moved the functions around in the C code file, to match
the order Clutter uses them, and the order they are explained
in the recipe.
---
 doc/cookbook/examples/cb-button.c | 103 +++++++++++++-----------------
 1 file changed, 46 insertions(+), 57 deletions(-)

diff --git a/doc/cookbook/examples/cb-button.c b/doc/cookbook/examples/cb-button.c
index 20ee6e5c1..49543b653 100644
--- a/doc/cookbook/examples/cb-button.c
+++ b/doc/cookbook/examples/cb-button.c
@@ -145,11 +145,54 @@ cb_button_get_property (GObject    *gobject,
 
 /* ClutterActor implementation
  *
- * we only implement allocate(), paint(), get_preferred_height()
- * and get_preferred_width(), as this is the minimum
- * we can get away with
+ * we only implement get_preferred_height(), get_preferred_width(),
+ * allocate(), and paint(), as this is the minimum we can get away with
  */
 
+/* get_preferred_height and get_preferred_width defer to the
+ * internal ClutterBox, adding 20px padding on each axis;
+ * min_*_p is the minimum height or width the actor should occupy
+ * to be useful; natural_*_p is the height or width the actor
+ * would occupy if not constrained
+ *
+ * note that if we required explicit sizing for CbButtons
+ * (i.e. a developer must set their height and width),
+ * we wouldn't need to implement these functions
+ */
+static void
+cb_button_get_preferred_height (ClutterActor *self,
+                                gfloat for_width,
+                                gfloat *min_height_p,
+                                gfloat *natural_height_p)
+{
+  CbButtonPrivate *priv = CB_BUTTON (self)->priv;
+
+  clutter_actor_get_preferred_height (priv->child,
+                                      for_width,
+                                      min_height_p,
+                                      natural_height_p);
+
+  *min_height_p += 20.0;
+  *natural_height_p += 20.0;
+}
+
+static void
+cb_button_get_preferred_width (ClutterActor *self,
+                               gfloat for_height,
+                               gfloat *min_width_p,
+                               gfloat *natural_width_p)
+{
+  CbButtonPrivate *priv = CB_BUTTON (self)->priv;
+
+  clutter_actor_get_preferred_width (priv->child,
+                                     for_height,
+                                     min_width_p,
+                                     natural_width_p);
+
+  *min_width_p += 20.0;
+  *natural_width_p += 20.0;
+}
+
 /* use the actor's allocation for the ClutterBox */
 static void
 cb_button_allocate (ClutterActor          *actor,
@@ -187,60 +230,6 @@ cb_button_paint (ClutterActor *actor)
   clutter_actor_paint (priv->child);
 }
 
-/* get_preferred_height defers to the internal ClutterBox
- * but adds 20px padding around it;
- * min_height_p is the minimum height the actor should occupy
- * to be useful; natural_height_p is the height the actor
- * would occupy if not constrained
- *
- * note that if we required explicit sizing for CbButtons
- * (i.e. a developer must set their height and width),
- * we wouldn't need to implement this function
- */
-static void
-cb_button_get_preferred_height (ClutterActor *self,
-                                gfloat for_width,
-                                gfloat *min_height_p,
-                                gfloat *natural_height_p)
-{
-  CbButtonPrivate *priv = CB_BUTTON (self)->priv;
-
-  clutter_actor_get_preferred_height (priv->child,
-                                      for_width,
-                                      min_height_p,
-                                      natural_height_p);
-
-  *min_height_p += 20.0;
-  *natural_height_p += 20.0;
-}
-
-/* get_preferred_width defers to the internal ClutterBox
- * but adds 20px padding around it;
- * min_width_p is the minimum width the actor should occupy
- * to be useful; natural_width_p is the width the actor
- * would occupy if not constrained
- *
- * note that if we required explicit sizing for CbButtons
- * (i.e. a developer must set their height and width),
- * we wouldn't need to implement this function
- */
-static void
-cb_button_get_preferred_width (ClutterActor *self,
-                               gfloat for_height,
-                               gfloat *min_width_p,
-                               gfloat *natural_width_p)
-{
-  CbButtonPrivate *priv = CB_BUTTON (self)->priv;
-
-  clutter_actor_get_preferred_width (priv->child,
-                                     for_height,
-                                     min_width_p,
-                                     natural_width_p);
-
-  *min_width_p += 20.0;
-  *natural_width_p += 20.0;
-}
-
 /* proxy ClickAction signals so they become signals from the actor */
 static void
 cb_button_clicked (ClutterClickAction *action,