From 5e3426947f1cda36206b823802f0b2551b7df65f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 28 Nov 2004 05:09:55 +0000 Subject: [PATCH] New image 2004-11-28 Matthias Clasen * gtk/images/combo-box.png: New image * gtk/visual_index.xml: * gtk/Makefile.am (HTML_IMAGES): Add combo-box.png --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ docs/reference/ChangeLog | 7 +++++++ docs/reference/gtk/Makefile.am | 1 + docs/reference/gtk/images/combo-box.png | Bin 0 -> 2740 bytes docs/reference/gtk/visual_index.xml | 3 +++ docs/tools/widgets.c | 25 ++++++++++++++++++++++++ 9 files changed, 52 insertions(+) create mode 100644 docs/reference/gtk/images/combo-box.png diff --git a/ChangeLog b/ChangeLog index 6dd0a434c4..e310fe45a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-28 Matthias Clasen + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen * gtk/gtkcolorsel.c (key_press): Implement keynav for the color diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6dd0a434c4..e310fe45a2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2004-11-28 Matthias Clasen + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen * gtk/gtkcolorsel.c (key_press): Implement keynav for the color diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6dd0a434c4..e310fe45a2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2004-11-28 Matthias Clasen + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen * gtk/gtkcolorsel.c (key_press): Implement keynav for the color diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6dd0a434c4..e310fe45a2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2004-11-28 Matthias Clasen + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen * gtk/gtkcolorsel.c (key_press): Implement keynav for the color diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 3f6f8f189e..cbf23537f9 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,10 @@ +2004-11-28 Matthias Clasen + + * gtk/images/combo-box.png: New image + + * gtk/visual_index.xml: + * gtk/Makefile.am (HTML_IMAGES): Add combo-box.png + Sat Nov 20 16:01:51 2004 Owen Taylor * gdk/gdk-sections.txt gdk/gdk.types : Update for GdkPangoRenderer diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am index 684a4bb129..c257b677c1 100644 --- a/docs/reference/gtk/Makefile.am +++ b/docs/reference/gtk/Makefile.am @@ -210,6 +210,7 @@ HTML_IMAGES = \ $(srcdir)/images/button.png \ $(srcdir)/images/check-button.png \ $(srcdir)/images/color-button.png \ + $(srcdir)/images/combo-box.png \ $(srcdir)/images/combo-box-entry.png \ $(srcdir)/images/entry.png \ $(srcdir)/images/file-button.png \ diff --git a/docs/reference/gtk/images/combo-box.png b/docs/reference/gtk/images/combo-box.png new file mode 100644 index 0000000000000000000000000000000000000000..0fa98d2a637214be599d1ce567f0bf80fe1d8a18 GIT binary patch literal 2740 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 literal 0 HcmV?d00001 diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml index 489b68c506..03c25eaefd 100644 --- a/docs/reference/gtk/visual_index.xml +++ b/docs/reference/gtk/visual_index.xml @@ -11,6 +11,9 @@ + + + diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 58c6889633..543c96b68d 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -261,6 +261,10 @@ create_combo_box_entry (void) GtkWidget *widget; GtkWidget *align; + gtk_rc_parse_string ("style \"combo-box-entry-style\" {\n" + " GtkComboBox::appears-as-list = 1\n" + "}\n" + "widget_class \"GtkComboBoxEntry\" style \"combo-box-entry-style\"\n" ); widget = gtk_combo_box_entry_new_text (); gtk_entry_set_text (GTK_ENTRY (GTK_BIN (widget)->child), "Combo Box Entry"); align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); @@ -269,6 +273,26 @@ create_combo_box_entry (void) return new_widget_info ("combo-box-entry", align, SMALL); } +static WidgetInfo * +create_combo_box (void) +{ + GtkWidget *widget; + GtkWidget *align; + + gtk_rc_parse_string ("style \"combo-box-style\" {\n" + " GtkComboBox::appears-as-list = 0\n" + "}\n" + "widget_class \"GtkComboBox\" style \"combo-box-style\"\n" ); + + widget = gtk_combo_box_new_text (); + gtk_combo_box_append_text (GTK_COMBO_BOX (widget), "Combo Box"); + gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); + align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); + gtk_container_add (GTK_CONTAINER (align), widget); + + return new_widget_info ("combo-box", align, SMALL); +} + static WidgetInfo * create_text_view (void) { @@ -759,6 +783,7 @@ get_all_widgets (void) retval = g_list_prepend (retval, create_button ()); retval = g_list_prepend (retval, create_check_button ()); retval = g_list_prepend (retval, create_color_button ()); + retval = g_list_prepend (retval, create_combo_box ()); retval = g_list_prepend (retval, create_combo_box_entry ()); retval = g_list_prepend (retval, create_entry ()); retval = g_list_prepend (retval, create_file_button ());