diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 7 | ||||
| -rw-r--r-- | docs/reference/gtk/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/gtk/images/combo-box.png | bin | 0 -> 2740 bytes | |||
| -rw-r--r-- | docs/reference/gtk/visual_index.xml | 3 | ||||
| -rw-r--r-- | docs/tools/widgets.c | 25 |
9 files changed, 52 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2004-11-28 Matthias Clasen <mclasen@redhat.com> + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen <mclasen@redhat.com> * 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 <mclasen@redhat.com> + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen <mclasen@redhat.com> * 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 <mclasen@redhat.com> + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen <mclasen@redhat.com> * 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 <mclasen@redhat.com> + + * docs/tools/widgets.c: Add a combo box. + 2004-11-27 Matthias Clasen <mclasen@redhat.com> * 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 <mclasen@redhat.com> + + * 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 <otaylor@redhat.com> * 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 Binary files differnew file mode 100644 index 0000000000..0fa98d2a63 --- /dev/null +++ b/docs/reference/gtk/images/combo-box.png 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 @@ <link linkend="GtkColorButton"> <inlinegraphic fileref="color-button.png" format="PNG"></inlinegraphic> </link> + <link linkend="GtkComboBox"> + <inlinegraphic fileref="combo-box.png" format="PNG"></inlinegraphic> + </link> <link linkend="GtkComboBoxEntry"> <inlinegraphic fileref="combo-box-entry.png" format="PNG"></inlinegraphic> </link> 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); @@ -270,6 +274,26 @@ create_combo_box_entry (void) } 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) { GtkWidget *widget; @@ -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 ()); |
