Remove all traces of GDK_PIXBUF/GTK_DISABLE_SINGLE_INCLUDES

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

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 79aea584c3030e8efff01ede88a5c961bb709774..cbe40f9ca5e5682b18da9b44557e6f3cbee03423 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__
 
@@ -42,7 +46,7 @@ struct _GtkComboBox
   GtkBin parent_instance;
 
   /*< private >*/
-  GtkComboBoxPrivate *priv;
+  GtkComboBoxPrivate *GSEAL (priv);
 };
 
 struct _GtkComboBoxClass
@@ -52,16 +56,18 @@ struct _GtkComboBoxClass
   /* signals */
   void     (* changed)          (GtkComboBox *combo_box);
 
+  /* vfuncs */
+  gchar *  (* get_active_text)  (GtkComboBox *combo_box);
+
   /* Padding for future expansion */
   void (*_gtk_reserved0) (void);
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (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_model   (GtkTreeModel    *model);
 
@@ -80,6 +86,14 @@ 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,
@@ -98,7 +112,11 @@ GtkTreeViewRowSeparatorFunc gtk_combo_box_get_row_separator_func (GtkComboBox
 void                        gtk_combo_box_set_row_separator_func (GtkComboBox                *combo_box,
                                                                  GtkTreeViewRowSeparatorFunc func,
                                                                  gpointer                    data,
-                                                                 GtkDestroyNotify            destroy);
+                                                                 GDestroyNotify              destroy);
+
+void               gtk_combo_box_set_button_sensitivity (GtkComboBox        *combo_box,
+                                                        GtkSensitivityType  sensitivity);
+GtkSensitivityType gtk_combo_box_get_button_sensitivity (GtkComboBox        *combo_box);
 
 /* convenience -- text */
 GtkWidget    *gtk_combo_box_new_text         (void);
@@ -118,8 +136,6 @@ void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
 void          gtk_combo_box_popdown          (GtkComboBox     *combo_box);
 AtkObject*    gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
 
-/* private */
-gboolean     _gtk_combo_box_editing_canceled (GtkComboBox     *combo_box);
 
 G_END_DECLS