projects / profile / ivi / clutter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7e01ee)
2008-01-31 Emmanuele Bassi <ebassi@openedhand.com>
authorEmmanuele Bassi <ebassi@openedhand.com>
Thu, 31 Jan 2008 14:24:04 +0000 (14:24 +0000)
committerEmmanuele Bassi <ebassi@openedhand.com>
Thu, 31 Jan 2008 14:24:04 +0000 (14:24 +0000)
* clutter/clutter-entry.h:
* clutter/clutter-entry.c:
(clutter_entry_set_cursor_position),
(clutter_entry_get_cursor_position): Rename [gs]et_position()
to [gs]set_cursor_position(), and avoid method name collisions
with bindings for high-level languages.

* clutter/clutter-deprecated.h: Add replacement warnings for the
renamed methods.

ChangeLog patch | blob | history
clutter/clutter-deprecated.h patch | blob | history
clutter/clutter-entry.c patch | blob | history
clutter/clutter-entry.h patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 4d64ee2..5d97fc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-01-31  Emmanuele Bassi  <ebassi@openedhand.com>
 
+       * clutter/clutter-entry.h:
+       * clutter/clutter-entry.c:
+       (clutter_entry_set_cursor_position),
+       (clutter_entry_get_cursor_position): Rename [gs]et_position()
+       to [gs]set_cursor_position(), and avoid method name collisions
+       with bindings for high-level languages.
+
+       * clutter/clutter-deprecated.h: Add replacement warnings for the
+       renamed methods.
+
+2008-01-31  Emmanuele Bassi  <ebassi@openedhand.com>
+
        * clutter/clutter-actor.c (clutter_actor_init): Explicitly
        memset() to 0 the clip container, so if you get the clip without
        having set it, you won't get garbage.
diff --git a/clutter/clutter-deprecated.h b/clutter/clutter-deprecated.h
index 88a800a..e79ffc8 100644 (file)
--- a/clutter/clutter-deprecated.h
+++ b/clutter/clutter-deprecated.h
@@ -34,4 +34,7 @@
 #define clutter_actor_set_scale_with_gravity         clutter_actor_set_scale_with_gravity_DEPRECATED_BY_clutter_actor_set_anchor_point_from_gravity
 #define clutter_actor_set_scale_with_gravityx        clutter_actor_set_scale_with_gravity_DEPRECATED_BY_clutter_actor_set_anchor_point_from_gravity
 
+#define clutter_entry_set_position              clutter_entry_set_position_REPLACED_BY_clutter_entry_set_cursor_position
+#define clutter_entry_get_position              clutter_entry_get_position_REPLACED_BY_clutter_entry_get_cursor_position
+
 #endif /* CLUTTER_DEPRECATED_H */
diff --git a/clutter/clutter-entry.c b/clutter/clutter-entry.c
index 62feccd..e79925d 100644 (file)
--- a/clutter/clutter-entry.c
+++ b/clutter/clutter-entry.c
@@ -145,7 +145,7 @@ clutter_entry_set_entry_padding (ClutterEntry *entry,
     {
       priv->entry_padding = padding;
 
-      if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+      if (CLUTTER_ACTOR_IS_VISIBLE (entry))
         clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 
       g_object_notify (G_OBJECT (entry), "entry-padding");
@@ -179,7 +179,7 @@ clutter_entry_set_property (GObject      *object,
       clutter_entry_set_alignment (entry, g_value_get_enum (value));
       break;
     case PROP_POSITION:
-      clutter_entry_set_position (entry, g_value_get_int (value));
+      clutter_entry_set_cursor_position (entry, g_value_get_int (value));
       break;
     case PROP_CURSOR:
       clutter_entry_set_visible_cursor (entry, g_value_get_boolean (value));
@@ -957,8 +957,8 @@ clutter_entry_set_text (ClutterEntry *entry,
   clutter_entry_clear_layout (entry);
   clutter_entry_clear_cursor_position (entry);
 
-  if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR(entry)))
-    clutter_actor_queue_redraw (CLUTTER_ACTOR(entry));
+  if (CLUTTER_ACTOR_IS_VISIBLE (entry))
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 
   g_signal_emit (G_OBJECT (entry), entry_signals[TEXT_CHANGED], 0);
 
@@ -1040,7 +1040,7 @@ clutter_entry_set_font_name (ClutterEntry *entry,
     {
       clutter_entry_clear_layout (entry);
 
-      if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+      if (CLUTTER_ACTOR_IS_VISIBLE (entry))
        clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
     }
 
@@ -1167,7 +1167,7 @@ clutter_entry_set_alignment (ClutterEntry   *entry,
 
       clutter_entry_clear_layout (entry);
 
-      if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+      if (CLUTTER_ACTOR_IS_VISIBLE (entry))
        clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 
       g_object_notify (G_OBJECT (entry), "alignment");
@@ -1194,7 +1194,7 @@ clutter_entry_get_alignment (ClutterEntry *entry)
 }
 
 /**
- * clutter_entry_set_position:
+ * clutter_entry_set_cursor_position:
  * @entry: a #ClutterEntry
  * @position: the position of the cursor.
  *
@@ -1203,10 +1203,11 @@ clutter_entry_get_alignment (ClutterEntry *entry)
  * that the position should be set after the last character in the entry.
  * Note that this position is in characters, not in bytes.
  *
- * Since: 0.4
+ * Since: 0.6
  */
 void
-clutter_entry_set_position (ClutterEntry *entry, gint position)
+clutter_entry_set_cursor_position (ClutterEntry *entry,
+                                   gint          position)
 {
   ClutterEntryPrivate *priv;
   gint len;
@@ -1227,22 +1228,22 @@ clutter_entry_set_position (ClutterEntry *entry, gint position)
 
   clutter_entry_clear_cursor_position (entry);
 
-  if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+  if (CLUTTER_ACTOR_IS_VISIBLE (entry))
     clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 }
 
 /**
- * clutter_entry_get_position:
+ * clutter_entry_get_cursor_position:
  * @entry: a #ClutterEntry
  *
  * Gets the position, in characters, of the cursor in @entry.
  *
  * Return value: the position of the cursor.
  *
- * Since: 0.4
+ * Since: 0.6
  */
 gint
-clutter_entry_get_position (ClutterEntry *entry)
+clutter_entry_get_cursor_position (ClutterEntry *entry)
 {
   ClutterEntryPrivate *priv;
 
@@ -1313,9 +1314,9 @@ clutter_entry_handle_key_event (ClutterEntry    *entry,
         if (pos != 0 && len != 0)
           {
             if (pos == -1)
-              clutter_entry_set_position (entry, len - 1);
+              clutter_entry_set_cursor_position (entry, len - 1);
             else
-              clutter_entry_set_position (entry, pos - 1);
+              clutter_entry_set_cursor_position (entry, pos - 1);
           }
         break;
       case CLUTTER_Right:
@@ -1323,17 +1324,17 @@ clutter_entry_handle_key_event (ClutterEntry    *entry,
         if (pos != -1 && len != 0)
           {
             if (pos != len)
-              clutter_entry_set_position (entry, pos + 1);
+              clutter_entry_set_cursor_position (entry, pos + 1);
           }
         break;
       case CLUTTER_End:
       case CLUTTER_KP_End:
-        clutter_entry_set_position (entry, -1);
+        clutter_entry_set_cursor_position (entry, -1);
         break;
       case CLUTTER_Begin:
       case CLUTTER_Home:
       case CLUTTER_KP_Home:
-        clutter_entry_set_position (entry, 0);
+        clutter_entry_set_cursor_position (entry, 0);
         break;
       default:
         clutter_entry_insert_unichar (entry,
@@ -1377,7 +1378,7 @@ clutter_entry_insert_unichar (ClutterEntry *entry,
   clutter_entry_set_text (entry, new->str);
 
   if (priv->position >= 0)
-    clutter_entry_set_position (entry, priv->position + 1);
+    clutter_entry_set_cursor_position (entry, priv->position + 1);
 
   g_string_free (new, TRUE);
 
@@ -1430,7 +1431,7 @@ clutter_entry_delete_chars (ClutterEntry *entry,
   clutter_entry_set_text (entry, new->str);
 
   if (priv->position > 0)
-    clutter_entry_set_position (entry, priv->position - num);
+    clutter_entry_set_cursor_position (entry, priv->position - num);
 
   g_string_free (new, TRUE);
 
@@ -1538,7 +1539,7 @@ clutter_entry_set_visible_cursor (ClutterEntry *entry,
 
       g_object_notify (G_OBJECT (entry), "cursor-visible");
 
-      if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+      if (CLUTTER_ACTOR_IS_VISIBLE (entry))
         clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
     }
 }
@@ -1589,7 +1590,7 @@ clutter_entry_set_visibility (ClutterEntry *entry, gboolean visible)
   clutter_entry_clear_layout (entry);
   clutter_entry_clear_cursor_position (entry);
 
-  if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR (entry)))
+  if (CLUTTER_ACTOR_IS_VISIBLE (entry))
     clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 }
 
@@ -1642,8 +1643,8 @@ clutter_entry_set_invisible_char (ClutterEntry *entry, gunichar wc)
   clutter_entry_clear_layout (entry);
   clutter_entry_clear_cursor_position (entry);
 
-  if (CLUTTER_ACTOR_IS_VISIBLE (CLUTTER_ACTOR(entry)))
-    clutter_actor_queue_redraw (CLUTTER_ACTOR(entry));
+  if (CLUTTER_ACTOR_IS_VISIBLE (entry))
+    clutter_actor_queue_redraw (CLUTTER_ACTOR (entry));
 }
 
 /**
diff --git a/clutter/clutter-entry.h b/clutter/clutter-entry.h
index 87a73bc..ec5ead4 100644 (file)
--- a/clutter/clutter-entry.h
+++ b/clutter/clutter-entry.h
@@ -106,54 +106,54 @@ struct _ClutterEntryClass
 
 GType clutter_entry_get_type (void) G_GNUC_CONST;
 
-ClutterActor *        clutter_entry_new                (void);
-ClutterActor *        clutter_entry_new_full           (const gchar        *font_name,
-                                                       const gchar        *text,
-                                                       const ClutterColor *color);
-ClutterActor *        clutter_entry_new_with_text      (const gchar        *font_name,
-                                                        const gchar        *text);
-void                  clutter_entry_set_text           (ClutterEntry       *entry,
-                                                       const gchar        *text);
-G_CONST_RETURN gchar *clutter_entry_get_text           (ClutterEntry       *entry);
-void                  clutter_entry_set_font_name      (ClutterEntry       *entry,
-                                                       const gchar        *font_name);
-G_CONST_RETURN gchar *clutter_entry_get_font_name      (ClutterEntry       *entry);
-void                  clutter_entry_set_color          (ClutterEntry       *entry,
-                                                       const ClutterColor *color);
-void                  clutter_entry_get_color          (ClutterEntry       *entry,
-                                                       ClutterColor       *color);
-PangoLayout *         clutter_entry_get_layout         (ClutterEntry       *entry);
-void                  clutter_entry_set_alignment      (ClutterEntry       *entry,
-                                                        PangoAlignment      alignment);
-PangoAlignment        clutter_entry_get_alignment      (ClutterEntry       *entry);
-void                  clutter_entry_set_position       (ClutterEntry       *entry,
-                                                        gint                position);
-gint                  clutter_entry_get_position       (ClutterEntry       *entry);
-void                  clutter_entry_handle_key_event   (ClutterEntry       *entry,
-                                                        ClutterKeyEvent    *kev);
-void                  clutter_entry_insert_unichar     (ClutterEntry       *entry,
-                                                        gunichar            wc);
-void                  clutter_entry_delete_chars       (ClutterEntry       *entry,
-                                                        guint               len);
-void                  clutter_entry_insert_text        (ClutterEntry       *entry,
-                                                        const gchar        *text,
-                                                        gssize              position);
-void                  clutter_entry_delete_text        (ClutterEntry       *entry,
-                                                        gssize              start_pos,
-                                                        gssize              end_pos);
-void                  clutter_entry_set_visible_cursor (ClutterEntry       *entry,
-                                                        gboolean            visible);
-gboolean              clutter_entry_get_visible_cursor (ClutterEntry       *entry);
-
-void                  clutter_entry_set_visibility     (ClutterEntry       *entry,
-                                                        gboolean            visible);
-gboolean              clutter_entry_get_visibility     (ClutterEntry       *entry);
-void                  clutter_entry_set_invisible_char (ClutterEntry       *entry,
-                                                        gunichar            wc);
-gunichar              clutter_entry_get_invisible_char (ClutterEntry       *entry);
-void                  clutter_entry_set_max_length     (ClutterEntry       *entry,
-                                                        gint                max);
-gint                  clutter_entry_get_max_length     (ClutterEntry       *entry);
+ClutterActor *        clutter_entry_new                 (void);
+ClutterActor *        clutter_entry_new_full            (const gchar        *font_name,
+                                                        const gchar        *text,
+                                                        const ClutterColor *color);
+ClutterActor *        clutter_entry_new_with_text       (const gchar        *font_name,
+                                                         const gchar        *text);
+void                  clutter_entry_set_text            (ClutterEntry       *entry,
+                                                        const gchar        *text);
+G_CONST_RETURN gchar *clutter_entry_get_text            (ClutterEntry       *entry);
+void                  clutter_entry_set_font_name       (ClutterEntry       *entry,
+                                                        const gchar        *font_name);
+G_CONST_RETURN gchar *clutter_entry_get_font_name       (ClutterEntry       *entry);
+void                  clutter_entry_set_color           (ClutterEntry       *entry,
+                                                        const ClutterColor *color);
+void                  clutter_entry_get_color           (ClutterEntry       *entry,
+                                                        ClutterColor       *color);
+PangoLayout *         clutter_entry_get_layout          (ClutterEntry       *entry);
+void                  clutter_entry_set_alignment       (ClutterEntry       *entry,
+                                                         PangoAlignment      alignment);
+PangoAlignment        clutter_entry_get_alignment       (ClutterEntry       *entry);
+void                  clutter_entry_set_cursor_position (ClutterEntry       *entry,
+                                                         gint                position);
+gint                  clutter_entry_get_cursor_position (ClutterEntry       *entry);
+void                  clutter_entry_handle_key_event    (ClutterEntry       *entry,
+                                                         ClutterKeyEvent    *kev);
+void                  clutter_entry_insert_unichar      (ClutterEntry       *entry,
+                                                         gunichar            wc);
+void                  clutter_entry_delete_chars        (ClutterEntry       *entry,
+                                                         guint               len);
+void                  clutter_entry_insert_text         (ClutterEntry       *entry,
+                                                         const gchar        *text,
+                                                         gssize              position);
+void                  clutter_entry_delete_text         (ClutterEntry       *entry,
+                                                         gssize              start_pos,
+                                                         gssize              end_pos);
+void                  clutter_entry_set_visible_cursor  (ClutterEntry       *entry,
+                                                         gboolean            visible);
+gboolean              clutter_entry_get_visible_cursor  (ClutterEntry       *entry);
+
+void                  clutter_entry_set_visibility      (ClutterEntry       *entry,
+                                                         gboolean            visible);
+gboolean              clutter_entry_get_visibility      (ClutterEntry       *entry);
+void                  clutter_entry_set_invisible_char  (ClutterEntry       *entry,
+                                                         gunichar            wc);
+gunichar              clutter_entry_get_invisible_char  (ClutterEntry       *entry);
+void                  clutter_entry_set_max_length      (ClutterEntry       *entry,
+                                                         gint                max);
+gint                  clutter_entry_get_max_length      (ClutterEntry       *entry);
 
 G_END_DECLS
 
Domain: Graphics System / Rendering Engine;