System fnmatch wasn't going to be UTF-8 clean, neither was our version.

[~andy/gtk] / gtk / gtkentry.h

diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index f94072b98e0977fa8d987d91a6682f163da2dc44..b6b4ad44c834e4fc4de1a8d5f4a0e62ed42669df 100644 (file)
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -40,11 +40,11 @@ extern "C" {
 
 
 #define GTK_TYPE_ENTRY                  (gtk_entry_get_type ())
-#define GTK_ENTRY(obj)                  (GTK_CHECK_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
-#define GTK_ENTRY_CLASS(klass)          (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY, GtkEntryClass))
-#define GTK_IS_ENTRY(obj)               (GTK_CHECK_TYPE ((obj), GTK_TYPE_ENTRY))
-#define GTK_IS_ENTRY_CLASS(klass)       (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY))
-#define GTK_ENTRY_GET_CLASS(obj)        (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_ENTRY, GtkEntryClass))
+#define GTK_ENTRY(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
+#define GTK_ENTRY_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY, GtkEntryClass))
+#define GTK_IS_ENTRY(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY))
+#define GTK_IS_ENTRY_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY))
+#define GTK_ENTRY_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY, GtkEntryClass))
 
 
 typedef struct _GtkEntry       GtkEntry;
@@ -80,9 +80,18 @@ struct _GtkEntry
   guint        has_frame : 1;
 
   guint        activates_default : 1;
+
+  guint        cursor_visible : 1;
+
+  guint        in_click : 1;   /* Flag so we don't select all when clicking in entry to focus in */
+
+  guint        is_cell_renderer : 1;
+  guint        editing_canceled : 1; /* Only used by GtkCellRendererText */
+
+  guint        mouse_cursor_obscured : 1;
   
   guint   button;
-  guint   timer;
+  guint   blink_timeout;
   guint   recompute_idle;
   gint    scroll_offset;
   gint    ascent;      /* font ascent, in pango units  */
@@ -107,17 +116,6 @@ struct _GtkEntry
 struct _GtkEntryClass
 {
   GtkWidgetClass parent_class;
-  
-  /* Notification of changes
-   */
-  void (* changed)          (GtkEntry       *entry);
-  void (* insert_text)      (GtkEntry       *entry,
-                            const gchar    *text,
-                            gint            length,
-                            gint           *position);
-  void (* delete_text)      (GtkEntry       *entry,
-                            gint            start_pos,
-                            gint            end_pos);
 
   /* Hook to customize right-click popup */
   void (* populate_popup)   (GtkEntry       *entry,
@@ -139,22 +137,29 @@ struct _GtkEntryClass
   void (* copy_clipboard)     (GtkEntry       *entry);
   void (* paste_clipboard)    (GtkEntry       *entry);
   void (* toggle_overwrite)   (GtkEntry       *entry);
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
-GtkType    gtk_entry_get_type                  (void) G_GNUC_CONST;
+GType      gtk_entry_get_type                  (void) G_GNUC_CONST;
 GtkWidget* gtk_entry_new                       (void);
 void       gtk_entry_set_visibility            (GtkEntry      *entry,
                                                 gboolean       visible);
+gboolean   gtk_entry_get_visibility             (GtkEntry      *entry);
 void       gtk_entry_set_invisible_char         (GtkEntry      *entry,
                                                  gunichar       ch);
-void       gtk_entry_set_editable              (GtkEntry      *entry,
-                                                gboolean       editable);
+gunichar   gtk_entry_get_invisible_char         (GtkEntry      *entry);
 void       gtk_entry_set_has_frame              (GtkEntry      *entry,
                                                  gboolean       setting);
 gboolean   gtk_entry_get_has_frame              (GtkEntry      *entry);
 /* text is truncated if needed */
 void       gtk_entry_set_max_length            (GtkEntry      *entry,
                                                 gint           max);
+gint       gtk_entry_get_max_length             (GtkEntry      *entry);
 void       gtk_entry_set_activates_default      (GtkEntry      *entry,
                                                  gboolean       setting);
 gboolean   gtk_entry_get_activates_default      (GtkEntry      *entry);
@@ -170,8 +175,15 @@ void                  gtk_entry_set_text        (GtkEntry      *entry,
 /* returns a reference to the text */
 G_CONST_RETURN gchar* gtk_entry_get_text        (GtkEntry      *entry);
 
+PangoLayout* gtk_entry_get_layout               (GtkEntry      *entry);
+void         gtk_entry_get_layout_offsets       (GtkEntry      *entry,
+                                                 gint          *x,
+                                                 gint          *y);
+
 /* Deprecated compatibility functions
  */
+
+#ifndef GTK_DISABLE_DEPRECATED
 GtkWidget* gtk_entry_new_with_max_length       (gint           max);
 void       gtk_entry_append_text               (GtkEntry      *entry,
                                                 const gchar   *text);
@@ -182,6 +194,9 @@ void       gtk_entry_set_position                   (GtkEntry      *entry,
 void       gtk_entry_select_region             (GtkEntry      *entry,
                                                 gint           start,
                                                 gint           end);
+void       gtk_entry_set_editable              (GtkEntry      *entry,
+                                                gboolean       editable);
+#endif /* GTK_DISABLE_DEPRECATED */
 
 #ifdef __cplusplus
 }