Commit 0dae051d authored by Owen Taylor's avatar Owen Taylor

Conversion to use Paolo Molaro's GtkCombo instead of GtkComboBox

parent a7a7e430
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
Tue Jan 20 16:38:52 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkcombobox.{c,h}: removed
gtk/gtkcombo.{c,h}: added [Paolo Molaro's version]
gtk/testgtk.c: changed to use new version
gtk/Makefile.am gtk/gtk.h
Mon Jan 19 16:21:00 1998 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* gtk/gtktoolbar.c (gtk_toolbar_class_init): Set
......
......@@ -18,7 +18,7 @@ libgtk_la_SOURCES = \
gtkcheckmenuitem.c \
gtkclist.c \
gtkcolorsel.c \
gtkcombobox.c \
gtkcombo.c \
gtkcontainer.c \
gtkcurve.c \
gtkdata.c \
......@@ -108,7 +108,7 @@ gtkinclude_HEADERS = \
gtkcheckmenuitem.h \
gtkclist.h \
gtkcolorsel.h \
gtkcombobox.h \
gtkcombo.h \
gtkcontainer.h \
gtkcurve.h \
gtkdata.h \
......
......@@ -33,7 +33,7 @@
#include <gtk/gtkcheckmenuitem.h>
#include <gtk/gtkclist.h>
#include <gtk/gtkcolorsel.h>
#include <gtk/gtkcombobox.h>
#include <gtk/gtkcombo.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtkcurve.h>
#include <gtk/gtkdata.h>
......
This diff is collapsed.
/* gtkcombo - combo widget for gtk+
* Copyright 1997 Paolo Molaro
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __GTK_SMART_COMBO_H__
#define __GTK_SMART_COMBO_H__
#include <gtk/gtkhbox.h>
#include <gtk/gtkitem.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_COMBO(obj) GTK_CHECK_CAST (obj, gtk_combo_get_type (), GtkCombo)
#define GTK_COMBO_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_combo_get_type (), GtkComboClass)
#define GTK_IS_COMBO(obj) GTK_CHECK_TYPE (obj, gtk_combo_get_type ())
typedef struct _GtkCombo GtkCombo;
typedef struct _GtkComboClass GtkComboClass;
/* you should access only the entry and list fields directly */
struct _GtkCombo {
GtkHBox hbox;
GtkWidget *entry;
GtkWidget *button;
GtkWidget *popup;
GtkWidget *popwin;
GtkWidget *list;
gint entry_change_id;
gint list_change_id;
guint value_in_list:1;
guint ok_if_empty:1;
guint case_sensitive:1;
guint use_arrows:1;
guint use_arrows_always:1;
};
struct _GtkComboClass {
GtkHBoxClass parent_class;
};
guint gtk_combo_get_type (void);
GtkWidget *gtk_combo_new (void);
/* the text in the entry must be or not be in the list */
void gtk_combo_set_value_in_list (GtkCombo* combo,
gint val,
gint ok_if_empty);
/* set/unset arrows working for changing the value (can be annoying */
void gtk_combo_set_use_arrows (GtkCombo* combo,
gint val);
/* up/down arrows change value if current value not in list */
void gtk_combo_set_use_arrows_always (GtkCombo* combo,
gint val);
/* perform case-sensitive compares */
void gtk_combo_set_case_sensitive (GtkCombo* combo,
gint val);
/* call this function on an item if it isn't a label or you
want it to have a different value to be displayed in the entry */
void gtk_combo_set_item_string (GtkCombo* combo,
GtkItem* item,
const gchar* item_value);
/* simple interface */
void gtk_combo_set_popdown_strings (GtkCombo* combo,
GList *strings);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_SMART_COMBO_H__ */
This diff is collapsed.
/* GTK - The GIMP Toolkit
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
* Copyright (C) 1998 Elliot Lee
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __GTK_COMBO_BOX_H__
#define __GTK_COMBO_H__
#include <gdk/gdk.h>
#include <gtk/gtkentry.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_COMBO_BOX(obj) GTK_CHECK_CAST (obj, gtk_combo_box_get_type (), GtkComboBox)
#define GTK_COMBO_BOX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_combo_box_get_type (), GtkComboBoxClass)
#define GTK_IS_COMBO_BOX(obj) GTK_CHECK_TYPE (obj, gtk_combo_box_get_type ())
typedef struct _GtkComboBox GtkComboBox;
typedef struct _GtkComboBoxClass GtkComboBoxClass;
struct _GtkComboBox
{
GtkEntry parent_widget;
GtkWidget *popdown;
gboolean menu_is_down;
};
struct _GtkComboBoxClass
{
GtkEntryClass parent_class;
};
guint gtk_combo_box_get_type (void);
/* These GList's should be lists of strings that should be placed
in the popdown menu */
GtkWidget* gtk_combo_box_new (GList *popdown_strings);
GtkWidget* gtk_combo_box_new_with_max_length (GList *popdown_strings,
guint16 max);
void gtk_combo_box_set_popdown_strings(GtkComboBox *combobox,
GList *popdown_strings);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_COMBO_BOX_H__ */
......@@ -1360,9 +1360,10 @@ create_entry ()
gtk_box_pack_start (GTK_BOX (box2), entry, TRUE, TRUE, 0);
gtk_widget_show (entry);
cb = gtk_combo_box_new (cbitems);
gtk_entry_set_text (GTK_ENTRY (cb), "hello world");
gtk_entry_select_region (GTK_ENTRY (cb),
cb = gtk_combo_new ();
gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems);
gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(cb)->entry), "hello world");
gtk_entry_select_region (GTK_ENTRY (GTK_COMBO(cb)->entry),
0, GTK_ENTRY(entry)->text_length);
gtk_box_pack_start (GTK_BOX (box2), cb, TRUE, TRUE, 0);
gtk_widget_show (cb);
......@@ -2277,7 +2278,7 @@ create_text ()
gtk_widget_show (table);
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (text, TRUE);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_table_attach_defaults (GTK_TABLE (table), text, 0, 1, 0, 1);
gtk_widget_show (text);
......
......@@ -1360,9 +1360,10 @@ create_entry ()
gtk_box_pack_start (GTK_BOX (box2), entry, TRUE, TRUE, 0);
gtk_widget_show (entry);
cb = gtk_combo_box_new (cbitems);
gtk_entry_set_text (GTK_ENTRY (cb), "hello world");
gtk_entry_select_region (GTK_ENTRY (cb),
cb = gtk_combo_new ();
gtk_combo_set_popdown_strings (GTK_COMBO (cb), cbitems);
gtk_entry_set_text (GTK_ENTRY (GTK_COMBO(cb)->entry), "hello world");
gtk_entry_select_region (GTK_ENTRY (GTK_COMBO(cb)->entry),
0, GTK_ENTRY(entry)->text_length);
gtk_box_pack_start (GTK_BOX (box2), cb, TRUE, TRUE, 0);
gtk_widget_show (cb);
......@@ -2277,7 +2278,7 @@ create_text ()
gtk_widget_show (table);
text = gtk_text_new (NULL, NULL);
gtk_text_set_editable (text, TRUE);
gtk_text_set_editable (GTK_TEXT (text), TRUE);
gtk_table_attach_defaults (GTK_TABLE (table), text, 0, 1, 0, 1);
gtk_widget_show (text);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment