Landing the new ComboBox. Note that only gtkcombobox.h and

Fri Sep 26 23:49:44 2003  Kristian Rietveld  <kris@gtk.org>

	Landing the new ComboBox. Note that only gtkcombobox.h and
	gtkcomboboxentry.h are public.

	* gtk/gtkcellview.[ch], gtk/gtkcellviewmenuitem.[ch],
	gtk/gtkcombobox.[ch], gtk/gtkcomboboxentry.[ch]: new files.

	* gtk/Makefile.am, gtk/gtk.h: adding the new files.

	* tests/testcombo.c: and a new test.

	* tests/Makefile.am: adding the new test.

1 files changed, 313 insertions, 0 deletions

diff --git a/tests/testcombo.c b/tests/testcombo.c
new file mode 100644
index 0000000000..f3ff6f8385
--- /dev/null
+++ b/tests/testcombo.c
@@ -0,0 +1,313 @@
+#include <gtk/gtk.h>
+#include <gtk/gtkcellview.h>
+#include <gtk/gtkcellviewmenuitem.h>
+
+#include <string.h>
+#include <stdio.h>
+
+/**
+ * oh yes, this test app surely has a lot of ugly code
+ */
+
+/* grid combo demo */
+static GdkPixbuf *
+create_color_pixbuf (const char *color)
+{
+        GdkPixbuf *pixbuf;
+        GdkColor col;
+
+        int x;
+        int num;
+        int rowstride;
+        guchar *pixels, *p;
+
+        if (!gdk_color_parse (color, &col))
+                return NULL;
+
+        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+                                 FALSE, 8,
+                                 16, 16);
+
+        rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+        p = pixels = gdk_pixbuf_get_pixels (pixbuf);
+
+        num = gdk_pixbuf_get_width (pixbuf) *
+                gdk_pixbuf_get_height (pixbuf);
+
+        for (x = 0; x < num; x++) {
+                p[0] = col.red / 65535 * 255;
+                p[1] = col.green / 65535 * 255;
+                p[2] = col.blue / 65535 * 255;
+                p += 3;
+        }
+
+        return pixbuf;
+}
+
+static GtkWidget *
+create_combo_box_grid_demo ()
+{
+        GtkWidget *combo;
+        GtkTreeIter iter;
+        GtkCellRenderer *cell = gtk_cell_renderer_pixbuf_new ();
+        GtkListStore *store;
+
+        store = gtk_list_store_new (1, GDK_TYPE_PIXBUF);
+
+        combo = gtk_combo_box_new (GTK_TREE_MODEL (store));
+        gtk_combo_box_pack_start (GTK_COMBO_BOX (combo),
+                                  cell, TRUE);
+        gtk_combo_box_set_attributes (GTK_COMBO_BOX (combo),
+                                      cell, "pixbuf", 0, NULL);
+        gtk_combo_box_set_wrap_width (GTK_COMBO_BOX (combo),
+                                      3);
+
+        /* first row */
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("red"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("green"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("blue"),
+                            -1);
+
+        /* second row */
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("yellow"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("black"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("white"),
+                            -1);
+
+        /* third row */
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("gray"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("snow"),
+                            -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, create_color_pixbuf ("magenta"),
+                            -1);
+
+        gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+
+        return combo;
+}
+
+/* blaat */
+static GtkTreeModel *
+create_blaat ()
+{
+        GdkPixbuf *pixbuf;
+        GtkWidget *cellview;
+        GtkTreeIter iter;
+        GtkListStore *store;
+
+        cellview = gtk_cell_view_new ();
+
+        store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
+
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_DIALOG_WARNING,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, pixbuf,
+                            1, "gtk-stock-dialog-warning",
+                            -1);
+
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_STOP,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, pixbuf,
+                            1, "gtk-stock-stop",
+                            -1);
+
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_NEW,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, pixbuf,
+                            1, "gtk-stock-new",
+                            -1);
+
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_CLEAR,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter,
+                            0, pixbuf,
+                            1, "gtk-stock-clear",
+                            -1);
+
+        gtk_widget_destroy (cellview);
+
+        return GTK_TREE_MODEL (store);
+}
+
+static GtkTreeModel *
+create_text_store ()
+{
+        GtkTreeIter iter;
+        GtkListStore *store;
+
+        store = GTK_LIST_STORE (gtk_list_store_new (1, G_TYPE_STRING));
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "dum de dum", -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "la la la", -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "la la la dum de dum la la la la la la boom de da la la", -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "bloop", -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "bleep", -1);
+
+        gtk_list_store_append (store, &iter);
+        gtk_list_store_set (store, &iter, 0, "klaas", -1);
+
+        return GTK_TREE_MODEL (store);
+}
+
+int
+main (int argc, char **argv)
+{
+        GtkWidget *window, *cellview, *mainbox;
+        GtkWidget *combobox, *comboboxtext, *comboboxgrid;
+        GtkWidget *tmp, *boom;
+        GtkCellRenderer *renderer;
+        GdkPixbuf *pixbuf;
+        GValue value = {0, };
+
+        gtk_init (&argc, &argv);
+
+        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        gtk_container_set_border_width (GTK_CONTAINER (window), 5);
+        g_signal_connect (window, "delete_event", gtk_main_quit, NULL);
+
+        mainbox = gtk_vbox_new (FALSE, 2);
+        gtk_container_add (GTK_CONTAINER (window), mainbox);
+
+
+        /* GtkCellView */
+        tmp = gtk_frame_new ("GtkCellView");
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+
+        boom = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
+        gtk_container_add (GTK_CONTAINER (tmp), boom);
+
+        cellview = gtk_cell_view_new ();
+        renderer = gtk_cell_renderer_pixbuf_new ();
+        pixbuf = gtk_widget_render_icon (cellview, GTK_STOCK_DIALOG_WARNING,
+                                         GTK_ICON_SIZE_BUTTON, NULL);
+
+        gtk_cell_view_pack_start (GTK_CELL_VIEW (cellview),
+                                  renderer,
+                                  FALSE);
+        g_value_init (&value, GDK_TYPE_PIXBUF);
+        g_value_set_instance (&value, pixbuf);
+        gtk_cell_view_set_values (GTK_CELL_VIEW (cellview),
+                                  renderer,
+                                  "pixbuf", &value,
+                                  NULL);
+        g_value_unset (&value);
+
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_cell_view_pack_start (GTK_CELL_VIEW (cellview),
+                                  renderer,
+                                  TRUE);
+        g_value_init (&value, G_TYPE_STRING);
+        g_value_set_string (&value, "la la la");
+        gtk_cell_view_set_values (GTK_CELL_VIEW (cellview),
+                                  renderer,
+                                  "text", &value,
+                                  NULL);
+        g_value_unset (&value);
+        gtk_container_add (GTK_CONTAINER (boom), cellview);
+
+
+        /* GtkComboBox */
+        tmp = gtk_frame_new ("GtkComboBox");
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+
+        boom = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
+        gtk_container_add (GTK_CONTAINER (tmp), boom);
+
+        combobox = gtk_combo_box_new (create_blaat ());
+        gtk_container_add (GTK_CONTAINER (boom), combobox);
+
+        renderer = gtk_cell_renderer_pixbuf_new ();
+        gtk_combo_box_pack_start (GTK_COMBO_BOX (combobox),
+                                  renderer,
+                                  FALSE);
+        gtk_combo_box_set_attributes (GTK_COMBO_BOX (combobox), renderer, "pixbuf", 0, NULL);
+
+        renderer = gtk_cell_renderer_text_new ();
+        gtk_combo_box_pack_start (GTK_COMBO_BOX (combobox),
+                                  renderer,
+                                  TRUE);
+        gtk_combo_box_set_attributes (GTK_COMBO_BOX (combobox), renderer, "text", 1, NULL);
+
+        gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 1);
+
+
+        /* GtkComboBox (grid mode) */
+        tmp = gtk_frame_new ("GtkComboBox (grid mode)");
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+
+        boom = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
+        gtk_container_add (GTK_CONTAINER (tmp), boom);
+
+        comboboxgrid = create_combo_box_grid_demo ();
+        gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE, 0);
+
+
+        /* GtkComboBoxEntry */
+        tmp = gtk_frame_new ("GtkComboBoxEntry");
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+
+        boom = gtk_vbox_new (FALSE, 0);
+        gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
+        gtk_container_add (GTK_CONTAINER (tmp), boom);
+
+        comboboxtext = gtk_combo_box_entry_new (create_text_store (), 0);
+        gtk_container_add (GTK_CONTAINER (boom), comboboxtext);
+
+        /* done */
+        gtk_widget_show_all (window);
+
+        gtk_main ();
+
+        return 0;
+}
+
+/* vim:expandtab
+ */