X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcombobox.h;h=03d25ff3d03492b80fee407516ad51d5cbda671d;hb=32bd10bf74cd2b7f2d16432d4198dca82c386133;hp=1c674b9c06d4784253dfbe0345f404b97ed9b70e;hpb=cb916f274673322bb6bfe6ac7256d3526a15cbfa;p=~andy%2Fgtk
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index 1c674b9c0..03d25ff3d 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -12,18 +12,16 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
+#ifndef __GTK_COMBO_BOX_H__
+#define __GTK_COMBO_BOX_H__
+
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GTK_COMBO_BOX_H__
-#define __GTK_COMBO_BOX_H__
-
#include
#include
#include
@@ -54,19 +52,22 @@ struct _GtkComboBoxClass
GtkBinClass parent_class;
/* signals */
- void (* changed) (GtkComboBox *combo_box);
+ void (* changed) (GtkComboBox *combo_box);
+ gchar *(* format_entry_text) (GtkComboBox *combo_box,
+ const gchar *path);
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
void (*_gtk_reserved2) (void);
void (*_gtk_reserved3) (void);
- void (*_gtk_reserved4) (void);
};
/* construction */
GType gtk_combo_box_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_combo_box_new (void);
+GtkWidget *gtk_combo_box_new_with_area (GtkCellArea *area);
+GtkWidget *gtk_combo_box_new_with_area_and_entry (GtkCellArea *area);
GtkWidget *gtk_combo_box_new_with_entry (void);
GtkWidget *gtk_combo_box_new_with_model (GtkTreeModel *model);
GtkWidget *gtk_combo_box_new_with_model_and_entry (GtkTreeModel *model);
@@ -84,15 +85,15 @@ void gtk_combo_box_set_column_span_column (GtkComboBox *combo_box,
gboolean gtk_combo_box_get_add_tearoffs (GtkComboBox *combo_box);
void gtk_combo_box_set_add_tearoffs (GtkComboBox *combo_box,
- gboolean add_tearoffs);
+ 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);
+const 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);
+ gboolean focus_on_click);
/* get/set active item */
gint gtk_combo_box_get_active (GtkComboBox *combo_box);
@@ -110,21 +111,21 @@ 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,
- GDestroyNotify destroy);
+ GtkTreeViewRowSeparatorFunc func,
+ gpointer data,
+ GDestroyNotify destroy);
void gtk_combo_box_set_button_sensitivity (GtkComboBox *combo_box,
- GtkSensitivityType sensitivity);
+ 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 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 fixed);
gboolean gtk_combo_box_get_popup_fixed_width (GtkComboBox *combo_box);
/* programmatic control */
@@ -138,7 +139,7 @@ gint gtk_combo_box_get_id_column (GtkComboBox *combo_box);
void gtk_combo_box_set_id_column (GtkComboBox *combo_box,
gint id_column);
const gchar * gtk_combo_box_get_active_id (GtkComboBox *combo_box);
-void gtk_combo_box_set_active_id (GtkComboBox *combo_box,
+gboolean gtk_combo_box_set_active_id (GtkComboBox *combo_box,
const gchar *active_id);
G_END_DECLS