diff options
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 046d48e1ca..0874726b17 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -258,7 +258,7 @@ static void gtk_combo_box_model_row_changed (GtkTreeModel *model, gpointer data); static void gtk_combo_box_menu_activate (GtkWidget *menu, - const gchar *path, + const char *path, GtkComboBox *combo_box); static void gtk_combo_box_update_sensitivity (GtkComboBox *combo_box); static gboolean gtk_combo_box_menu_key (GtkEventControllerKey *key, @@ -284,8 +284,8 @@ static void gtk_combo_box_entry_contents_changed (GtkEntry *e gpointer user_data); static void gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, gpointer user_data); -static gchar *gtk_combo_box_format_entry_text (GtkComboBox *combo_box, - const gchar *path); +static char *gtk_combo_box_format_entry_text (GtkComboBox *combo_box, + const char *path); /* GtkBuildable method implementation */ static GtkBuildableIface *parent_buildable_iface; @@ -294,21 +294,21 @@ static void gtk_combo_box_buildable_init (GtkBuildableIface static void gtk_combo_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type); + const char *type); static gboolean gtk_combo_box_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data); static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data); static GObject *gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname); + const char *childname); @@ -515,9 +515,9 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass) * Here's an example signal handler which fetches data from the model and * displays it in the entry. * |[<!-- language="C" --> - * static gchar* + * static char * * format_entry_text_callback (GtkComboBox *combo, - * const gchar *path, + * const char *path, * gpointer user_data) * { * GtkTreeIter iter; @@ -1691,7 +1691,7 @@ gtk_combo_box_scroll_controller_scroll (GtkEventControllerScroll *scroll, /* callbacks */ static void gtk_combo_box_menu_activate (GtkWidget *menu, - const gchar *path, + const char *path, GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2315,8 +2315,8 @@ gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, if (entry) { GtkTreePath *path; - gchar *path_str; - gchar *text = NULL; + char *path_str; + char *text = NULL; model = gtk_combo_box_get_model (combo_box); path = gtk_tree_model_get_path (model, &iter); @@ -2343,14 +2343,14 @@ gtk_combo_box_entry_active_changed (GtkComboBox *combo_box, } } -static gchar * +static char * gtk_combo_box_format_entry_text (GtkComboBox *combo_box, - const gchar *path) + const char *path) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); GtkTreeModel *model; GtkTreeIter iter; - gchar *text = NULL; + char *text = NULL; if (priv->text_column >= 0) { @@ -2735,7 +2735,7 @@ static void gtk_combo_box_buildable_add_child (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *type) + const char *type) { if (GTK_IS_CELL_RENDERER (child)) _gtk_cell_layout_buildable_add_child (buildable, builder, child, type); @@ -2749,7 +2749,7 @@ static gboolean gtk_combo_box_buildable_custom_tag_start (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, GtkBuildableParser *parser, gpointer *data) { @@ -2765,7 +2765,7 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, GtkBuilder *builder, GObject *child, - const gchar *tagname, + const char *tagname, gpointer data) { if (!_gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname, data)) @@ -2775,7 +2775,7 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable, static GObject * gtk_combo_box_buildable_get_internal_child (GtkBuildable *buildable, GtkBuilder *builder, - const gchar *childname) + const char *childname) { GtkComboBox *combo_box = GTK_COMBO_BOX (buildable); GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2852,7 +2852,7 @@ gtk_combo_box_get_id_column (GtkComboBox *combo_box) * * Returns: (nullable): the ID of the active row, or %NULL **/ -const gchar * +const char * gtk_combo_box_get_active_id (GtkComboBox *combo_box) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); @@ -2873,8 +2873,8 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box) if (gtk_combo_box_get_active_iter (combo_box, &iter)) { - const gchar *interned; - gchar *id; + const char *interned; + char *id; gtk_tree_model_get (model, &iter, column, &id, -1); interned = g_intern_string (id); @@ -2904,7 +2904,7 @@ gtk_combo_box_get_active_id (GtkComboBox *combo_box) **/ gboolean gtk_combo_box_set_active_id (GtkComboBox *combo_box, - const gchar *active_id) + const char *active_id) { GtkComboBoxPrivate *priv = gtk_combo_box_get_instance_private (combo_box); GtkTreeModel *model; @@ -2931,7 +2931,7 @@ gtk_combo_box_set_active_id (GtkComboBox *combo_box, if (gtk_tree_model_get_iter_first (model, &iter)) do { - gchar *id; + char *id; gtk_tree_model_get (model, &iter, column, &id, -1); if (id != NULL) |