diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-05-28 00:03:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-05-27 20:23:50 -0400 |
| commit | 2ef8bd0b95dc758af59f70ec65cb54aa4101fffa (patch) | |
| tree | 868c387d2199498646a8ad2ae3c2c8ff1a55d3f1 /gtk | |
| parent | 90aebd4f842d308757d8d979249a4ff444826489 (diff) | |
| download | gtk+-2ef8bd0b95dc758af59f70ec65cb54aa4101fffa.tar.gz | |
entry completion: Make final
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkentrycompletion.h | 36 | ||||
| -rw-r--r-- | gtk/gtkentryprivate.h | 28 |
2 files changed, 28 insertions, 36 deletions
diff --git a/gtk/gtkentrycompletion.h b/gtk/gtkentrycompletion.h index d06449b26c..dfe561c474 100644 --- a/gtk/gtkentrycompletion.h +++ b/gtk/gtkentrycompletion.h @@ -33,14 +33,9 @@ G_BEGIN_DECLS #define GTK_TYPE_ENTRY_COMPLETION (gtk_entry_completion_get_type ()) #define GTK_ENTRY_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletion)) -#define GTK_ENTRY_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass)) #define GTK_IS_ENTRY_COMPLETION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ENTRY_COMPLETION)) -#define GTK_IS_ENTRY_COMPLETION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ENTRY_COMPLETION)) -#define GTK_ENTRY_COMPLETION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ENTRY_COMPLETION, GtkEntryCompletionClass)) typedef struct _GtkEntryCompletion GtkEntryCompletion; -typedef struct _GtkEntryCompletionClass GtkEntryCompletionClass; -typedef struct _GtkEntryCompletionPrivate GtkEntryCompletionPrivate; /** * GtkEntryCompletionMatchFunc: @@ -65,37 +60,6 @@ typedef gboolean (* GtkEntryCompletionMatchFunc) (GtkEntryCompletion *completion gpointer user_data); -struct _GtkEntryCompletion -{ - GObject parent_instance; - - /*< private >*/ - GtkEntryCompletionPrivate *priv; -}; - -struct _GtkEntryCompletionClass -{ - GObjectClass parent_class; - - gboolean (* match_selected) (GtkEntryCompletion *completion, - GtkTreeModel *model, - GtkTreeIter *iter); - void (* action_activated) (GtkEntryCompletion *completion, - gint index_); - gboolean (* insert_prefix) (GtkEntryCompletion *completion, - const gchar *prefix); - gboolean (* cursor_on_match) (GtkEntryCompletion *completion, - GtkTreeModel *model, - GtkTreeIter *iter); - void (* no_matches) (GtkEntryCompletion *completion); - - /* Padding for future expansion */ - void (*_gtk_reserved0) (void); - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); -}; - -/* core */ GDK_AVAILABLE_IN_ALL GType gtk_entry_completion_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL diff --git a/gtk/gtkentryprivate.h b/gtk/gtkentryprivate.h index 5d6c9d8877..14696eb5ca 100644 --- a/gtk/gtkentryprivate.h +++ b/gtk/gtkentryprivate.h @@ -30,6 +30,34 @@ G_BEGIN_DECLS +typedef struct _GtkEntryCompletionClass GtkEntryCompletionClass; +typedef struct _GtkEntryCompletionPrivate GtkEntryCompletionPrivate; + +struct _GtkEntryCompletion +{ + GObject parent_instance; + + /*< private >*/ + GtkEntryCompletionPrivate *priv; +}; + +struct _GtkEntryCompletionClass +{ + GObjectClass parent_class; + + gboolean (* match_selected) (GtkEntryCompletion *completion, + GtkTreeModel *model, + GtkTreeIter *iter); + void (* action_activated) (GtkEntryCompletion *completion, + gint index_); + gboolean (* insert_prefix) (GtkEntryCompletion *completion, + const gchar *prefix); + gboolean (* cursor_on_match) (GtkEntryCompletion *completion, + GtkTreeModel *model, + GtkTreeIter *iter); + void (* no_matches) (GtkEntryCompletion *completion); +}; + struct _GtkEntryCompletionPrivate { GtkWidget *entry; |