summaryrefslogtreecommitdiff
path: root/gtk/gtkcombo.c
diff options
context:
space:
mode:
authorTim Janik <timj@src.gnome.org>1998-02-02 14:11:24 +0000
committerTim Janik <timj@src.gnome.org>1998-02-02 14:11:24 +0000
commitc3154703d0cbcd4c0aaf55d7767398aa5fe8c4bd (patch)
tree76b4812ccf10595c23c455d3f7dd5ad225d8dedd /gtk/gtkcombo.c
parent57bae555749aec7e0ff016a3db35af53d85ca844 (diff)
downloadgdk-pixbuf-c3154703d0cbcd4c0aaf55d7767398aa5fe8c4bd.tar.gz
watch the next ChangeLog update...
-timj
Diffstat (limited to 'gtk/gtkcombo.c')
-rw-r--r--gtk/gtkcombo.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index b2fe20952..6e87f2ba5 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -33,7 +33,7 @@
#include "gdk/gdkkeysyms.h"
#include "gtkcombo.h"
-const gchar *gtk_combo_string_key = "_combo_string_value";
+const gchar *gtk_combo_string_key = "gtk-combo-string-value";
#define COMBO_LIST_MAX_HEIGHT 400
@@ -84,8 +84,8 @@ gtk_combo_class_init (GtkComboClass * klass)
static void
gtk_combo_destroy (GtkObject * combo)
{
-
- gtk_object_unref (GTK_OBJECT (GTK_COMBO (combo)->popwin));
+ gtk_widget_destroy (GTK_COMBO (combo)->popwin);
+ gtk_widget_unref (GTK_COMBO (combo)->popwin);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(*GTK_OBJECT_CLASS (parent_class)->destroy) (combo);
@@ -148,7 +148,7 @@ gtk_combo_find (GtkCombo * combo)
if (combo->case_sensitive)
string_compare = strcmp;
else
- string_compare = g_strcasecmp;
+ string_compare = (void*) g_strcasecmp;
text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
clist = GTK_LIST (combo->list)->children;
@@ -386,6 +386,7 @@ gtk_combo_init (GtkCombo * combo)
(GtkSignalFunc)prelight_bug, combo); */
combo->popwin = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_ref (combo->popwin);
gtk_window_set_policy (GTK_WINDOW (combo->popwin), 1, 1, 0);
combo->popup = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (combo->popup),