Remove GtkComboBoxEntry and the combo box text api

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

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 504f33edacb9c6c2383349b20eff190fd5b3b183..c5b6a3c1e078a8d0d88e140f7368e4b6878c3dad 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -17,6 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
 #ifndef __GTK_COMBO_BOX_H__
 #define __GTK_COMBO_BOX_H__
 
@@ -53,30 +57,46 @@ struct _GtkComboBoxClass
   void     (* changed)          (GtkComboBox *combo_box);
 
   /* Padding for future expansion */
-  void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
   void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
 };
 
 
 /* construction */
-GType         gtk_combo_box_get_type         (void);
+GType         gtk_combo_box_get_type         (void) G_GNUC_CONST;
 GtkWidget    *gtk_combo_box_new              (void);
+GtkWidget    *gtk_combo_box_new_with_entry   (void);
 GtkWidget    *gtk_combo_box_new_with_model   (GtkTreeModel    *model);
 
 /* grids */
+gint          gtk_combo_box_get_wrap_width         (GtkComboBox *combo_box);
 void          gtk_combo_box_set_wrap_width         (GtkComboBox *combo_box,
                                                     gint         width);
+gint          gtk_combo_box_get_row_span_column    (GtkComboBox *combo_box);
 void          gtk_combo_box_set_row_span_column    (GtkComboBox *combo_box,
                                                     gint         row_span);
+gint          gtk_combo_box_get_column_span_column (GtkComboBox *combo_box);
 void          gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
                                                     gint         column_span);
 
+gboolean      gtk_combo_box_get_add_tearoffs       (GtkComboBox *combo_box);
+void          gtk_combo_box_set_add_tearoffs       (GtkComboBox *combo_box,
+                                                   gboolean     add_tearoffs);
+
+G_CONST_RETURN gchar *gtk_combo_box_get_title      (GtkComboBox *combo_box);
+void                  gtk_combo_box_set_title      (GtkComboBox *combo_box,
+                                                   const gchar *title);
+
+gboolean      gtk_combo_box_get_focus_on_click     (GtkComboBox *combo);
+void          gtk_combo_box_set_focus_on_click     (GtkComboBox *combo,
+                                                   gboolean     focus_on_click);
+
 /* get/set active item */
 gint          gtk_combo_box_get_active       (GtkComboBox     *combo_box);
 void          gtk_combo_box_set_active       (GtkComboBox     *combo_box,
-                                              gint             index);
+                                              gint             index_);
 gboolean      gtk_combo_box_get_active_iter  (GtkComboBox     *combo_box,
                                               GtkTreeIter     *iter);
 void          gtk_combo_box_set_active_iter  (GtkComboBox     *combo_box,
@@ -87,17 +107,32 @@ void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
                                               GtkTreeModel    *model);
 GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
 
-/* convenience -- text */
-GtkWidget    *gtk_combo_box_new_text         (void);
-void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_insert_text      (GtkComboBox     *combo_box,
-                                              gint             position,
-                                              const gchar     *text);
-void          gtk_combo_box_prepend_text     (GtkComboBox     *combo_box,
-                                              const gchar     *text);
-void          gtk_combo_box_remove_text      (GtkComboBox     *combo_box,
-                                              gint             position);
+GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox                *combo_box);
+void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
+                                                                 GtkTreeViewRowSeparatorFunc func,
+                                                                 gpointer                    data,
+                                                                 GDestroyNotify              destroy);
+
+void               gtk_combo_box_set_button_sensitivity (GtkComboBox        *combo_box,
+                                                        GtkSensitivityType  sensitivity);
+GtkSensitivityType gtk_combo_box_get_button_sensitivity (GtkComboBox        *combo_box);
+
+gboolean           gtk_combo_box_get_has_entry          (GtkComboBox        *combo_box);
+void               gtk_combo_box_set_entry_text_column  (GtkComboBox        *combo_box,
+                                                        gint                text_column);
+gint               gtk_combo_box_get_entry_text_column  (GtkComboBox        *combo_box);
+
+void               gtk_combo_box_set_popup_fixed_width  (GtkComboBox      *combo_box,
+                                                        gboolean          fixed);
+gboolean           gtk_combo_box_get_popup_fixed_width  (GtkComboBox      *combo_box);
+
+/* programmatic control */
+void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
+void          gtk_combo_box_popup_for_device (GtkComboBox     *combo_box,
+                                              GdkDevice       *device);
+void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
+AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
+
 
 G_END_DECLS