[gtk+] Remove GtkComboBoxEntry and the combo box text api

From: Matthias Clasen <matthiasc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Remove GtkComboBoxEntry and the combo box text api
Date: Wed, 20 Oct 2010 09:03:02 +0000 (UTC)
commit 0219eea4d7542610bdc680f3fd9347105e183d7d
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 20 11:02:03 2010 +0200

    Remove GtkComboBoxEntry and the combo box text api

 docs/reference/gtk/gtk-docs.sgml     |    1 -
 docs/reference/gtk/gtk3-sections.txt |   27 --
 docs/reference/gtk/gtk3.types        |    1 -
 gtk/Makefile.am                      |    2 -
 gtk/gtk.h                            |    1 -
 gtk/gtk.symbols                      |   19 --
 gtk/gtkbuilder.c                     |    1 -
 gtk/gtkcombobox.c                    |  239 +---------------
 gtk/gtkcombobox.h                    |   20 --
 gtk/gtkcomboboxentry.c               |  529 ----------------------------------
 gtk/gtkcomboboxentry.h               |   81 ------
 11 files changed, 3 insertions(+), 918 deletions(-)
---
diff --git a/docs/reference/gtk/gtk-docs.sgml b/docs/reference/gtk/gtk-docs.sgml
index 146665e..13d964d 100644
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -154,7 +154,6 @@
       <title>Menus, Combo Box, Toolbar</title>
       <xi:include href="xml/gtkcombobox.xml" />
       <xi:include href="xml/gtkcomboboxtext.xml" />
-      <xi:include href="xml/gtkcomboboxentry.xml" />
       <xi:include href="xml/gtkmenu.xml" />
       <xi:include href="xml/gtkmenubar.xml" />
       <xi:include href="xml/gtkmenuitem.xml" />
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index c710838..363e86a 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -781,12 +781,6 @@ gtk_combo_box_get_active_iter
 gtk_combo_box_set_active_iter
 gtk_combo_box_get_model
 gtk_combo_box_set_model
-gtk_combo_box_new_text
-gtk_combo_box_append_text
-gtk_combo_box_insert_text
-gtk_combo_box_prepend_text
-gtk_combo_box_remove_text
-gtk_combo_box_get_active_text
 gtk_combo_box_popup_for_device
 gtk_combo_box_popup
 gtk_combo_box_popdown
@@ -817,27 +811,6 @@ gtk_combo_box_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkcomboboxentry</FILE>
-<TITLE>GtkComboBoxEntry</TITLE>
-GtkComboBoxEntry
-gtk_combo_box_entry_new
-gtk_combo_box_entry_new_with_model
-gtk_combo_box_entry_new_text
-gtk_combo_box_entry_set_text_column
-gtk_combo_box_entry_get_text_column
-<SUBSECTION Standard>
-GTK_TYPE_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY
-GTK_COMBO_BOX_ENTRY_CLASS
-GTK_IS_COMBO_BOX_ENTRY
-GTK_IS_COMBO_BOX_ENTRY_CLASS
-GTK_COMBO_BOX_ENTRY_GET_CLASS
-<SUBSECTION Private>
-GtkComboBoxEntryPrivate
-gtk_combo_box_entry_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkcomboboxtext</FILE>
 <TITLE>GtkComboBoxText</TITLE>
 GtkComboBoxText
diff --git a/docs/reference/gtk/gtk3.types b/docs/reference/gtk/gtk3.types
index 2af1aaa..5c78b15 100644
--- a/docs/reference/gtk/gtk3.types
+++ b/docs/reference/gtk/gtk3.types
@@ -40,7 +40,6 @@ gtk_clipboard_get_type
 gtk_color_button_get_type
 gtk_color_selection_dialog_get_type
 gtk_color_selection_get_type
-gtk_combo_box_entry_get_type
 gtk_combo_box_get_type
 gtk_combo_box_text_get_type
 gtk_container_get_type
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 4943fb5..05ee07b 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -187,7 +187,6 @@ gtk_public_h_sources =          \
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
 	gtkcombobox.h		\
-	gtkcomboboxentry.h	\
 	gtkcomboboxtext.h	\
 	gtkcontainer.h		\
 	gtkdebug.h              \
@@ -446,7 +445,6 @@ gtk_base_c_sources =            \
 	gtkcolorsel.c		\
 	gtkcolorseldialog.c	\
 	gtkcombobox.c		\
-	gtkcomboboxentry.c	\
 	gtkcomboboxtext.c 	\
 	gtkcontainer.c		\
 	gtkdialog.c		\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 36764b1..c4f3824 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -71,7 +71,6 @@
 #include <gtk/gtkcolorsel.h>
 #include <gtk/gtkcolorseldialog.h>
 #include <gtk/gtkcombobox.h>
-#include <gtk/gtkcomboboxentry.h>
 #include <gtk/gtkcomboboxtext.h>
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkdebug.h>
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index b10ef1c..f9f0a22 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -791,10 +791,8 @@ gtk_color_selection_dialog_get_color_selection
 
 #if IN_HEADER(__GTK_COMBO_BOX_H__)
 #if IN_FILE(__GTK_COMBO_BOX_C__)
-gtk_combo_box_append_text
 gtk_combo_box_get_active
 gtk_combo_box_get_active_iter
-gtk_combo_box_get_active_text
 gtk_combo_box_get_add_tearoffs
 gtk_combo_box_get_column_span_column
 gtk_combo_box_get_entry_text_column
@@ -809,16 +807,12 @@ gtk_combo_box_get_button_sensitivity
 gtk_combo_box_get_title
 gtk_combo_box_get_type G_GNUC_CONST
 gtk_combo_box_get_wrap_width
-gtk_combo_box_insert_text
 gtk_combo_box_new
-gtk_combo_box_new_text
 gtk_combo_box_new_with_entry
 gtk_combo_box_new_with_model
 gtk_combo_box_popdown
 gtk_combo_box_popup
 gtk_combo_box_popup_for_device
-gtk_combo_box_prepend_text
-gtk_combo_box_remove_text
 gtk_combo_box_set_active
 gtk_combo_box_set_active_iter
 gtk_combo_box_set_add_tearoffs
@@ -848,19 +842,6 @@ gtk_combo_box_text_remove
 #endif
 #endif
 
-#if IN_HEADER(__GTK_COMBO_BOX_ENTRY_H__)
-#if IN_FILE(__GTK_COMBO_BOX_ENTRY_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_combo_box_entry_get_text_column
-gtk_combo_box_entry_get_type G_GNUC_CONST
-gtk_combo_box_entry_new
-gtk_combo_box_entry_new_text
-gtk_combo_box_entry_new_with_model
-gtk_combo_box_entry_set_text_column
-#endif
-#endif
-#endif
-
 #if IN_HEADER(__GTK_CONTAINER_H__)
 #if IN_FILE(__GTK_CONTAINER_C__)
 gtk_container_add
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 13c0f4b..3a34fee 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -221,7 +221,6 @@
  * <link linkend="GtkCellLayout-BUILDER-UI">GtkCellLayout</link>,
  * <link linkend="GtkColorSelectionDialog-BUILDER-UI">GtkColorSelectionDialog</link>,
  * <link linkend="GtkFontSelectionDialog-BUILDER-UI">GtkFontSelectionDialog</link>,
- * <link linkend="GtkComboBoxEntry-BUILDER-UI">GtkComboBoxEntry</link>,
  * <link linkend="GtkExpander-BUILDER-UI">GtkExpander</link>,
  * <link linkend="GtkFrame-BUILDER-UI">GtkFrame</link>,
  * <link linkend="GtkListStore-BUILDER-UI">GtkListStore</link>,
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 09e5899..69f6078 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -334,7 +334,6 @@ static void     gtk_combo_box_set_active_internal  (GtkComboBox      *combo_box,
 						    GtkTreePath      *path);
 
 static void     gtk_combo_box_check_appearance     (GtkComboBox      *combo_box);
-static gchar *  gtk_combo_box_real_get_active_text (GtkComboBox      *combo_box);
 static void     gtk_combo_box_real_move_active     (GtkComboBox      *combo_box,
                                                     GtkScrollType     scroll);
 static void     gtk_combo_box_real_popup           (GtkComboBox      *combo_box);
@@ -552,8 +551,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
   GtkWidgetClass *widget_class;
   GtkBindingSet *binding_set;
 
-  klass->get_active_text = gtk_combo_box_real_get_active_text;
-
   container_class = (GtkContainerClass *)klass;
   container_class->forall = gtk_combo_box_forall;
   container_class->add = gtk_combo_box_add;
@@ -587,10 +584,10 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
    * 
    * The changed signal is emitted when the active
    * item is changed. The can be due to the user selecting
-   * a different item from the list, or due to a 
+   * a different item from the list, or due to a
    * call to gtk_combo_box_set_active_iter().
-   * It will also be emitted while typing into a GtkComboBoxEntry, 
-   * as well as when selecting an item from the GtkComboBoxEntry's list.
+   * It will also be emitted while typing into the entry of a combo box
+   * with an entry.
    *
    * Since: 2.4
    */
@@ -5348,236 +5345,6 @@ gtk_combo_box_get_model (GtkComboBox *combo_box)
   return combo_box->priv->model;
 }
 
-
-/* convenience API for simple text combos */
-
-/**
- * gtk_combo_box_new_text:
- *
- * Convenience function which constructs a new text combo box, which is a
- * #GtkComboBox just displaying strings. If you use this function to create
- * a text combo box, you should only manipulate its data source with the
- * following convenience functions: gtk_combo_box_append_text(),
- * gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and
- * gtk_combo_box_remove_text().
- *
- * Return value: (transfer none): A new text combo box.
- *
- * Since: 2.4
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-GtkWidget *
-gtk_combo_box_new_text (void)
-{
-  GtkWidget *combo_box;
-  GtkCellRenderer *cell;
-  GtkListStore *store;
-
-  store = gtk_list_store_new (1, G_TYPE_STRING);
-  combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
-  g_object_unref (store);
-
-  cell = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, TRUE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
-                                  "text", 0,
-                                  NULL);
-
-  return combo_box;
-}
-
-/**
- * gtk_combo_box_append_text:
- * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text()
- * @text: A string
- *
- * Appends @string to the list of strings stored in @combo_box. Note that
- * you can only use this function with combo boxes constructed with
- * gtk_combo_box_new_text().
- *
- * Since: 2.4
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-void
-gtk_combo_box_append_text (GtkComboBox *combo_box,
-                           const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
-		    == G_TYPE_STRING);
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_insert_text:
- * @combo_box: A #GtkComboBox constructed using gtk_combo_box_new_text()
- * @position: An index to insert @text
- * @text: A string
- *
- * Inserts @string at @position in the list of strings stored in @combo_box.
- * Note that you can only use this function with combo boxes constructed
- * with gtk_combo_box_new_text().
- *
- * Since: 2.4
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-void
-gtk_combo_box_insert_text (GtkComboBox *combo_box,
-                           gint         position,
-                           const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (position >= 0);
-  g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
-		    == G_TYPE_STRING);
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_insert (store, &iter, position);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_prepend_text:
- * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text()
- * @text: A string
- *
- * Prepends @string to the list of strings stored in @combo_box. Note that
- * you can only use this function with combo boxes constructed with
- * gtk_combo_box_new_text().
- *
- * Since: 2.4
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-void
-gtk_combo_box_prepend_text (GtkComboBox *combo_box,
-                            const gchar *text)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
-		    == G_TYPE_STRING);
-  g_return_if_fail (text != NULL);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  gtk_list_store_prepend (store, &iter);
-  gtk_list_store_set (store, &iter, 0, text, -1);
-}
-
-/**
- * gtk_combo_box_remove_text:
- * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text()
- * @position: Index of the item to remove
- *
- * Removes the string at @position from @combo_box. Note that you can only use
- * this function with combo boxes constructed with gtk_combo_box_new_text().
- *
- * Since: 2.4
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-void
-gtk_combo_box_remove_text (GtkComboBox *combo_box,
-                           gint         position)
-{
-  GtkTreeIter iter;
-  GtkListStore *store;
-
-  g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
-  g_return_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model));
-  g_return_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
-		    == G_TYPE_STRING);
-  g_return_if_fail (position >= 0);
-
-  store = GTK_LIST_STORE (combo_box->priv->model);
-
-  if (gtk_tree_model_iter_nth_child (combo_box->priv->model, &iter,
-                                     NULL, position))
-    gtk_list_store_remove (store, &iter);
-}
-
-/**
- * gtk_combo_box_get_active_text:
- * @combo_box: A #GtkComboBox constructed with gtk_combo_box_new_text()
- *
- * Returns the currently active string in @combo_box or %NULL if none
- * is selected.
- *
- * Returns: a newly allocated string containing the currently active text.
- *     Must be freed with g_free().
- *
- * Since: 2.6
- *
- * Deprecated: 2.24: Use #GtkComboBoxText
- */
-gchar *
-gtk_combo_box_get_active_text (GtkComboBox *combo_box)
-{
-  GtkComboBoxClass *class;
-
-  g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
-
-  class = GTK_COMBO_BOX_GET_CLASS (combo_box);
-
-  if (class->get_active_text)
-    return class->get_active_text (combo_box);
-
-  return NULL;
-}
-
-static gchar *
-gtk_combo_box_real_get_active_text (GtkComboBox *combo_box)
-{
-  GtkTreeIter iter;
-  gchar *text = NULL;
-
-  if (combo_box->priv->has_entry)
-    {
-      GtkBin *combo = GTK_BIN (combo_box);
-      GtkWidget *child;
-
-      child = gtk_bin_get_child (combo);
-      if (child)
-	return g_strdup (gtk_entry_get_text (GTK_ENTRY (child)));
-
-      return NULL;
-    }
-  else
-    {
-      g_return_val_if_fail (GTK_IS_LIST_STORE (combo_box->priv->model), NULL);
-      g_return_val_if_fail (gtk_tree_model_get_column_type (combo_box->priv->model, 0)
-			    == G_TYPE_STRING, NULL);
-
-      if (gtk_combo_box_get_active_iter (combo_box, &iter))
-        gtk_tree_model_get (combo_box->priv->model, &iter,
-			    0, &text, -1);
-
-      return text;
-    }
-}
-
 static void
 gtk_combo_box_real_move_active (GtkComboBox   *combo_box,
                                 GtkScrollType  scroll)
diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
index f5d6417..c5b6a3c 100644
--- a/gtk/gtkcombobox.h
+++ b/gtk/gtkcombobox.h
@@ -56,9 +56,6 @@ struct _GtkComboBoxClass
   /* signals */
   void     (* changed)          (GtkComboBox *combo_box);
 
-  /* vfuncs */
-  gchar *  (* get_active_text)  (GtkComboBox *combo_box);
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -129,23 +126,6 @@ void               gtk_combo_box_set_popup_fixed_width  (GtkComboBox      *combo
 							 gboolean          fixed);
 gboolean           gtk_combo_box_get_popup_fixed_width  (GtkComboBox      *combo_box);
 
-#ifndef GTK_DISABLE_DEPRECATED
-
-/* 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);
-gchar        *gtk_combo_box_get_active_text  (GtkComboBox     *combo_box);
-
-#endif
-
 /* programmatic control */
 void          gtk_combo_box_popup            (GtkComboBox     *combo_box);
 void          gtk_combo_box_popup_for_device (GtkComboBox     *combo_box,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]