Add a tooltip explaining the format of page ranges, and improve the page

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

diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index c444bbec0af751b91923ba36b7c486e00cfb1115..6ab2d954540c17b3a1835d9a117046edf4913b40 100644 (file)
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -52,31 +52,48 @@ 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);
 
 /* 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,6 +104,12 @@ void          gtk_combo_box_set_model        (GtkComboBox     *combo_box,
                                               GtkTreeModel    *model);
 GtkTreeModel *gtk_combo_box_get_model        (GtkComboBox     *combo_box);
 
+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,
+                                                                 GtkDestroyNotify            destroy);
+
 /* convenience -- text */
 GtkWidget    *gtk_combo_box_new_text         (void);
 void          gtk_combo_box_append_text      (GtkComboBox     *combo_box,
@@ -103,17 +126,10 @@ gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
 /* programmatic control */
 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);
 
-/* insensitive items */
-typedef gboolean (*GtkComboBoxSelectionFunc) (GtkTreeModel *model,
-                                             GtkTreePath  *path,
-                                             gboolean      currently_selected,
-                                             gpointer      data);
-
-void gtk_combo_box_set_selection_func (GtkComboBox             *combo_box,
-                                      GtkComboBoxSelectionFunc func,
-                                      gpointer                 data,
-                                      GtkDestroyNotify         destroy);
+/* private */
+gboolean     _gtk_combo_box_editing_canceled (GtkComboBox     *combo_box);
 
 G_END_DECLS