* 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
+ * modify it under the terms of the GNU Lesser 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.
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU Library General Public
+ * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+/*
+ * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
+ * file for a list of people on the GTK+ Team. See the ChangeLog
+ * files for a list of changes. These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
#include <string.h>
#include "gtkarrow.h"
#include "gdk/gdkkeysyms.h"
#include "gtkcombo.h"
#include "gtkframe.h"
+#include "gtkintl.h"
const gchar *gtk_combo_string_key = "gtk-combo-string-value";
#define COMBO_LIST_MAX_HEIGHT (400)
#define EMPTY_LIST_HEIGHT (15)
-static void gtk_combo_class_init (GtkComboClass *klass);
-static void gtk_combo_init (GtkCombo *combo);
-static void gtk_combo_destroy (GtkObject *combo);
-static GtkListItem *gtk_combo_find (GtkCombo *combo);
-static gchar * gtk_combo_func (GtkListItem *li);
-static gint gtk_combo_focus_idle (GtkCombo *combo);
-static gint gtk_combo_entry_focus_out (GtkEntry *entry,
- GdkEventFocus *event,
- GtkCombo *combo);
-static void gtk_combo_get_pos (GtkCombo *combo,
- gint *x,
- gint *y,
- gint *height,
- gint *width);
-static void gtk_combo_popup_list (GtkCombo *combo);
-static void gtk_combo_activate (GtkWidget *widget,
- GtkCombo *combo);
-static void gtk_combo_popup_button_press (GtkWidget *button,
+enum {
+ PROP_0,
+ PROP_ENABLE_ARROW_KEYS,
+ PROP_ENABLE_ARROWS_ALWAYS,
+ PROP_CASE_SENSITIVE
+};
+
+static void gtk_combo_class_init (GtkComboClass *klass);
+static void gtk_combo_init (GtkCombo *combo);
+static void gtk_combo_destroy (GtkObject *combo);
+static GtkListItem *gtk_combo_find (GtkCombo *combo);
+static gchar * gtk_combo_func (GtkListItem *li);
+static gint gtk_combo_focus_idle (GtkCombo *combo);
+static gint gtk_combo_entry_focus_out (GtkEntry *entry,
+ GdkEventFocus *event,
+ GtkCombo *combo);
+static void gtk_combo_get_pos (GtkCombo *combo,
+ gint *x,
+ gint *y,
+ gint *height,
+ gint *width);
+static void gtk_combo_popup_list (GtkCombo *combo);
+static void gtk_combo_activate (GtkWidget *widget,
+ GtkCombo *combo);
+static gboolean gtk_combo_popup_button_press (GtkWidget *button,
GdkEventButton *event,
GtkCombo *combo);
-static void gtk_combo_popup_button_leave (GtkWidget *button,
+static gboolean gtk_combo_popup_button_leave (GtkWidget *button,
GdkEventCrossing *event,
GtkCombo *combo);
-static void gtk_combo_update_entry (GtkList *list,
- GtkCombo *combo);
-static void gtk_combo_update_list (GtkEntry *entry,
- GtkCombo *combo);
-static gint gtk_combo_button_press (GtkWidget *widget,
- GdkEvent *event,
- GtkCombo *combo);
-static gint gtk_combo_button_release (GtkWidget *widget,
- GdkEvent *event,
- GtkCombo *combo);
-static gint gtk_combo_list_enter (GtkWidget *widget,
- GdkEventCrossing *event,
- GtkCombo *combo);
-static gint gtk_combo_list_key_press (GtkWidget *widget,
- GdkEventKey *event,
- GtkCombo *combo);
-static gint gtk_combo_entry_key_press (GtkEntry *widget,
- GdkEventKey *event,
- GtkCombo *combo);
-static void gtk_combo_item_destroy (GtkObject *object);
-static void gtk_combo_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-
+static void gtk_combo_update_entry (GtkList *list,
+ GtkCombo *combo);
+static void gtk_combo_update_list (GtkEntry *entry,
+ GtkCombo *combo);
+static gint gtk_combo_button_press (GtkWidget *widget,
+ GdkEvent *event,
+ GtkCombo *combo);
+static gint gtk_combo_button_release (GtkWidget *widget,
+ GdkEvent *event,
+ GtkCombo *combo);
+static gint gtk_combo_list_enter (GtkWidget *widget,
+ GdkEventCrossing *event,
+ GtkCombo *combo);
+static gint gtk_combo_list_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ GtkCombo *combo);
+static gint gtk_combo_entry_key_press (GtkEntry *widget,
+ GdkEventKey *event,
+ GtkCombo *combo);
+static gint gtk_combo_window_key_press (GtkWidget *window,
+ GdkEventKey *event,
+ GtkCombo *combo);
+static void gtk_combo_item_destroy (GtkObject *object);
+static void gtk_combo_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_combo_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_combo_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
static GtkHBoxClass *parent_class = NULL;
static void
gtk_combo_class_init (GtkComboClass * klass)
{
+ GObjectClass *gobject_class;
GtkObjectClass *oclass;
GtkWidgetClass *widget_class;
- parent_class = gtk_type_class (gtk_hbox_get_type ());
+ gobject_class = (GObjectClass *) klass;
+ parent_class = gtk_type_class (GTK_TYPE_HBOX);
oclass = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
+ gobject_class->set_property = gtk_combo_set_property;
+ gobject_class->get_property = gtk_combo_get_property;
+
+ g_object_class_install_property (gobject_class,
+ PROP_ENABLE_ARROW_KEYS,
+ g_param_spec_boolean ("enable_arrow_keys",
+ _("Enable arrow keys"),
+ _("Whether the arrow keys move through the list of items"),
+ TRUE,
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (gobject_class,
+ PROP_ENABLE_ARROWS_ALWAYS,
+ g_param_spec_boolean ("enable_arrows_always",
+ _("Always enable arrows"),
+ _("Whether the arrow keys work, even if the entry contents are not in the list"),
+ TRUE,
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_object_class_install_property (gobject_class,
+ PROP_CASE_SENSITIVE,
+ g_param_spec_boolean ("case_sensitive",
+ _("Case sensitive"),
+ _("Whether list item matching is case sensitive"),
+ FALSE,
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
+
+
oclass->destroy = gtk_combo_destroy;
widget_class->size_allocate = gtk_combo_size_allocate;
}
static void
-gtk_combo_destroy (GtkObject * combo)
+gtk_combo_destroy (GtkObject *object)
{
- gtk_widget_destroy (GTK_COMBO (combo)->popwin);
- gtk_widget_unref (GTK_COMBO (combo)->popwin);
+ GtkCombo *combo = GTK_COMBO (object);
+
+ if (combo->popwin)
+ {
+ gtk_widget_destroy (combo->popwin);
+ gtk_widget_unref (combo->popwin);
+ combo->popwin = NULL;
+ }
- if (GTK_OBJECT_CLASS (parent_class)->destroy)
- (*GTK_OBJECT_CLASS (parent_class)->destroy) (combo);
+ GTK_OBJECT_CLASS (parent_class)->destroy (object);
}
static int
GList *li;
/* completion */
- if (event->keyval == GDK_Tab)
+ if ((event->keyval == GDK_Tab ||
+ event->keyval == GDK_ISO_Left_Tab ||
+ event->keyval == GDK_KP_Tab) &&
+ (event->state & GDK_MOD1_MASK))
{
+ GtkEditable *editable = GTK_EDITABLE (entry);
GCompletion * cmpl;
gchar* prefix;
gchar* nprefix = NULL;
gint pos;
+
+ if ( !GTK_LIST (combo->list)->children )
+ return FALSE;
gtk_signal_emit_stop_by_name (GTK_OBJECT (entry), "key_press_event");
- cmpl = g_completion_new((GCompletionFunc)gtk_combo_func);
- g_completion_add_items(cmpl, GTK_LIST(combo->list)->children);
- pos = GTK_EDITABLE(entry)->current_pos;
- prefix = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, pos);
- g_completion_complete(cmpl, prefix, &nprefix);
- if (nprefix && strlen(nprefix) > strlen(prefix))
+
+ cmpl = g_completion_new ((GCompletionFunc)gtk_combo_func);
+ g_completion_add_items (cmpl, GTK_LIST (combo->list)->children);
+
+ pos = gtk_editable_get_position (editable);
+ prefix = gtk_editable_get_chars (editable, 0, pos);
+
+ g_completion_complete (cmpl, prefix, &nprefix);
+
+ if (nprefix && strlen (nprefix) > strlen (prefix))
{
- gtk_editable_insert_text(GTK_EDITABLE(entry), nprefix+pos,
- strlen(nprefix)-strlen(prefix), &pos);
- GTK_EDITABLE(entry)->current_pos = pos;
+ gtk_editable_insert_text (editable, nprefix + pos,
+ strlen (nprefix) - strlen (prefix), &pos);
+ gtk_editable_set_position (editable, pos);
}
- g_free(prefix);
- g_completion_free(cmpl);
+
+ if (nprefix)
+ g_free (nprefix);
+ g_free (prefix);
+ g_completion_free (cmpl);
+
return TRUE;
}
+
if (!combo->use_arrows || !GTK_LIST (combo->list)->children)
return FALSE;
+
li = g_list_find (GTK_LIST (combo->list)->children, gtk_combo_find (combo));
if ((event->keyval == GDK_Up)
return FALSE;
}
+static int
+gtk_combo_window_key_press (GtkWidget *window,
+ GdkEventKey *event,
+ GtkCombo *combo)
+{
+ if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)
+ {
+ if (GTK_WIDGET_VISIBLE (combo->popwin))
+ {
+ gtk_widget_hide (combo->popwin);
+
+ if (GTK_WIDGET_HAS_GRAB (combo->popwin))
+ {
+ gtk_grab_remove (combo->popwin);
+ gdk_pointer_ungrab (event->time);
+ }
+ }
+
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (window), "key_press_event");
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
static GtkListItem *
gtk_combo_find (GtkCombo * combo)
{
gtk_combo_focus_idle (GtkCombo * combo)
{
if (combo)
- gtk_widget_grab_focus (combo->entry);
+ {
+ GDK_THREADS_ENTER ();
+ gtk_widget_grab_focus (combo->entry);
+ GDK_THREADS_LEAVE ();
+ }
return FALSE;
}
gint old_height;
gint old_width;
- widget = GTK_WIDGET(combo);
+ widget = GTK_WIDGET (combo);
popup = GTK_SCROLLED_WINDOW (combo->popup);
popwin = GTK_BIN (combo->popwin);
list_requisition.height += EMPTY_LIST_HEIGHT;
alloc_width = (widget->allocation.width -
- 2 * popwin->child->style->klass->xthickness -
+ 2 * popwin->child->style->xthickness -
2 * GTK_CONTAINER (popwin->child)->border_width -
2 * GTK_CONTAINER (combo->popup)->border_width -
- 2 * GTK_CONTAINER (popup->viewport)->border_width -
- 2 * popup->viewport->style->klass->xthickness);
+ 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width -
+ 2 * GTK_BIN (popup)->child->style->xthickness);
- work_height = (2 * popwin->child->style->klass->ythickness +
+ work_height = (2 * popwin->child->style->ythickness +
2 * GTK_CONTAINER (popwin->child)->border_width +
2 * GTK_CONTAINER (combo->popup)->border_width +
- 2 * GTK_CONTAINER (popup->viewport)->border_width +
- 2 * popup->viewport->style->klass->xthickness);
+ 2 * GTK_CONTAINER (GTK_BIN (popup)->child)->border_width +
+ 2 * GTK_BIN (popup)->child->style->xthickness);
do
{
if (!show_hscroll &&
alloc_width < list_requisition.width)
{
- work_height += popup->hscrollbar->requisition.height +
- GTK_SCROLLED_WINDOW_CLASS
- (GTK_OBJECT (combo->popup)->klass)->scrollbar_spacing;
+ work_height += (popup->hscrollbar->requisition.height +
+ GTK_SCROLLED_WINDOW_GET_CLASS (combo->popup)->scrollbar_spacing);
show_hscroll = TRUE;
}
if (!show_vscroll &&
*y -= (work_height + list_requisition.height + real_height);
break;
}
- alloc_width -=
- popup->vscrollbar->requisition.width +
- GTK_SCROLLED_WINDOW_CLASS
- (GTK_OBJECT (combo->popup)->klass)->scrollbar_spacing;
+ alloc_width -= (popup->vscrollbar->requisition.width +
+ GTK_SCROLLED_WINDOW_GET_CLASS (combo->popup)->scrollbar_spacing);
show_vscroll = TRUE;
}
} while (old_width != alloc_width || old_height != work_height);
if (!GTK_WIDGET_HAS_FOCUS (combo->entry))
gtk_widget_grab_focus (combo->entry);
+
gtk_grab_add (combo->popwin);
gdk_pointer_grab (combo->popwin->window, TRUE,
GDK_BUTTON_PRESS_MASK |
NULL, NULL, GDK_CURRENT_TIME);
}
-static void
+static gboolean
gtk_combo_popup_button_press (GtkWidget *button,
GdkEventButton *event,
GtkCombo *combo)
{
if (!GTK_WIDGET_HAS_FOCUS (combo->entry))
gtk_widget_grab_focus (combo->entry);
- if (!combo->current_button && (event->button == 1))
- gtk_combo_popup_list (combo);
+
+ if (event->button != 1)
+ return FALSE;
combo->current_button = event->button;
+
+ gtk_combo_popup_list (combo);
+ gtk_button_pressed (GTK_BUTTON (button));
+
+ gtk_grab_add (combo->popwin);
+ gdk_pointer_grab (combo->popwin->window, TRUE,
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK,
+ NULL, NULL, GDK_CURRENT_TIME);
+
+ GTK_LIST (combo->list)->drag_selection = TRUE;
+ gtk_grab_add (combo->list);
+
+ return TRUE;
}
-static void
+static gboolean
gtk_combo_popup_button_leave (GtkWidget *button,
GdkEventCrossing *event,
GtkCombo *combo)
{
- if (combo->current_button)
- gtk_signal_emit_stop_by_name (GTK_OBJECT (button), "leave_notify_event");
+ return combo->current_button != 0;
}
}
static gint
-gtk_combo_button_release (GtkWidget * widget, GdkEvent * event, GtkCombo * combo)
+gtk_combo_button_release (GtkWidget *widget,
+ GdkEvent *event,
+ GtkCombo *combo)
{
GtkWidget *child;
+ /* Horrible hack to get connect-after effect without regard to the return value of the default
+ * handler.
+ */
+ gtk_signal_handler_block_by_func (GTK_OBJECT (widget),
+ GTK_SIGNAL_FUNC (gtk_combo_button_release),
+ combo);
+ gtk_widget_event (widget, event);
+ gtk_signal_handler_unblock_by_func (GTK_OBJECT (widget),
+ GTK_SIGNAL_FUNC (gtk_combo_button_release),
+ combo);
+
if ((combo->current_button != 0) && (event->button.button == 1))
{
/* This was the initial button press */
if (widget != combo->button)
gtk_widget_event (combo->button, event);
- /* Un-pre-hightlight */
+ /* Un-pre-highlight */
tmp_event.type = GDK_LEAVE_NOTIFY;
tmp_event.window = combo->button->window;
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, NULL, GDK_CURRENT_TIME);
- return FALSE;
+ return TRUE;
}
}
else
{
/* The user has clicked inside the popwin and released */
- gtk_grab_remove (combo->popwin);
- gdk_pointer_ungrab (event->button.time);
+ if (GTK_WIDGET_HAS_GRAB (combo->popwin))
+ {
+ gtk_grab_remove (combo->popwin);
+ gdk_pointer_ungrab (event->button.time);
+ }
}
gtk_widget_hide (combo->popwin);
{
if (event->keyval == GDK_Escape)
{
+ if (GTK_WIDGET_HAS_GRAB (combo->popwin))
+ {
+ gtk_grab_remove (combo->popwin);
+ gdk_pointer_ungrab (GDK_CURRENT_TIME);
+ }
+ else if (GTK_WIDGET_HAS_GRAB (combo->list))
+ gtk_list_end_drag_selection (GTK_LIST (combo->list));
gtk_widget_hide (combo->popwin);
- gtk_grab_remove (combo->popwin);
- gdk_pointer_ungrab (GDK_CURRENT_TIME);
+ if (GTK_WIDGET_HAS_GRAB (combo->button))
+ {
+ combo->current_button = 0;
+ GTK_BUTTON (combo->button)->in_button = FALSE;
+ gtk_button_released (GTK_BUTTON (combo->button));
+ gtk_grab_remove (combo->button);
+ }
return TRUE;
}
return FALSE;
GtkWidget *event_box;
GdkCursor *cursor;
- combo->case_sensitive = 0;
- combo->value_in_list = 0;
- combo->ok_if_empty = 1;
- combo->use_arrows = 1;
- combo->use_arrows_always = 0;
+ combo->case_sensitive = FALSE;
+ combo->value_in_list = FALSE;
+ combo->ok_if_empty = TRUE;
+ combo->use_arrows = TRUE;
+ combo->use_arrows_always = FALSE;
combo->entry = gtk_entry_new ();
combo->button = gtk_button_new ();
combo->current_button = 0;
(GtkSignalFunc) gtk_combo_entry_focus_out, combo);
combo->activate_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "activate",
(GtkSignalFunc) gtk_combo_activate, combo);
- gtk_signal_connect_after (GTK_OBJECT (combo->button), "button_press_event",
- (GtkSignalFunc) gtk_combo_popup_button_press, combo);
- gtk_signal_connect_after (GTK_OBJECT (combo->button), "button_release_event",
- (GtkSignalFunc) gtk_combo_button_release, combo);
+ gtk_signal_connect (GTK_OBJECT (combo->button), "button_press_event",
+ (GtkSignalFunc) gtk_combo_popup_button_press, combo);
+ /*gtk_signal_connect_after (GTK_OBJECT (combo->button), "button_release_event",
+ (GtkSignalFunc) gtk_combo_button_release, combo);*/
gtk_signal_connect (GTK_OBJECT (combo->button), "leave_notify_event",
(GtkSignalFunc) gtk_combo_popup_button_leave, combo);
- /*gtk_signal_connect(GTK_OBJECT(combo->button), "clicked",
+ /*gtk_signal_connect (GTK_OBJECT (combo->button), "clicked",
(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);
+
+ gtk_signal_connect (GTK_OBJECT (combo->popwin), "key_press_event",
+ GTK_SIGNAL_FUNC (gtk_combo_window_key_press), combo);
gtk_widget_set_events (combo->popwin, GDK_KEY_PRESS_MASK);
*/
gtk_widget_set_events (combo->list, GDK_ENTER_NOTIFY_MASK);
- gtk_list_set_selection_mode(GTK_LIST(combo->list), GTK_SELECTION_BROWSE);
- gtk_container_add (GTK_CONTAINER (combo->popup), combo->list);
+ gtk_list_set_selection_mode (GTK_LIST(combo->list), GTK_SELECTION_BROWSE);
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (combo->popup), combo->list);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (combo->list),
gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (combo->popup)));
+ gtk_container_set_focus_hadjustment (GTK_CONTAINER (combo->list),
+ gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (combo->popup)));
gtk_widget_show (combo->list);
combo->list_change_id = gtk_signal_connect (GTK_OBJECT (combo->list), "selection_changed",
GTK_SIGNAL_FUNC (gtk_combo_list_enter), combo);
}
-guint
+GtkType
gtk_combo_get_type (void)
{
- static guint combo_type = 0;
+ static GtkType combo_type = 0;
if (!combo_type)
{
- GtkTypeInfo combo_info =
+ static const GtkTypeInfo combo_info =
{
"GtkCombo",
sizeof (GtkCombo),
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
- combo_type = gtk_type_unique (gtk_hbox_get_type (), &combo_info);
+ combo_type = gtk_type_unique (GTK_TYPE_HBOX, &combo_info);
}
return combo_type;
}
-GtkWidget *
+GtkWidget*
gtk_combo_new (void)
{
- return GTK_WIDGET (gtk_type_new (gtk_combo_get_type ()));
+ return GTK_WIDGET (gtk_type_new (GTK_TYPE_COMBO));
}
void
-gtk_combo_set_value_in_list (GtkCombo * combo, gint val, gint ok_if_empty)
+gtk_combo_set_value_in_list (GtkCombo * combo, gboolean val, gboolean ok_if_empty)
{
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->value_in_list = val;
}
void
-gtk_combo_set_case_sensitive (GtkCombo * combo, gint val)
+gtk_combo_set_case_sensitive (GtkCombo * combo, gboolean val)
{
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->case_sensitive = val;
+ g_object_notify (G_OBJECT (combo), "case_sensitive");
}
void
-gtk_combo_set_use_arrows (GtkCombo * combo, gint val)
+gtk_combo_set_use_arrows (GtkCombo * combo, gboolean val)
{
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->use_arrows = val;
+ g_object_notify (G_OBJECT (combo), "enable_arrow_keys");
}
void
-gtk_combo_set_use_arrows_always (GtkCombo * combo, gint val)
+gtk_combo_set_use_arrows_always (GtkCombo * combo, gboolean val)
{
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
combo->use_arrows_always = val;
- combo->use_arrows = 1;
+ combo->use_arrows = TRUE;
+ g_object_freeze_notify (G_OBJECT (combo));
+ g_object_notify (G_OBJECT (combo), "enable_arrow_keys");
+ g_object_notify (G_OBJECT (combo), "enable_arrows_always");
+ g_object_thaw_notify (G_OBJECT (combo));
}
void
GList *list;
GtkWidget *li;
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
g_return_if_fail (strings != NULL);
key = gtk_object_get_data (object, gtk_combo_string_key);
if (key)
- g_free (key);
+ {
+ gtk_object_remove_data (object, gtk_combo_string_key);
+ g_free (key);
+ }
}
void
gchar *val;
gint connected = 0;
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
g_return_if_fail (item != NULL);
}
if (item_value)
{
- val = g_strdup(item_value);
+ val = g_strdup (item_value);
gtk_object_set_data (GTK_OBJECT (item), gtk_combo_string_key, val);
if (!connected)
gtk_signal_connect (GTK_OBJECT (item), "destroy",
{
GtkCombo *combo;
- g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_COMBO (widget));
g_return_if_fail (allocation != NULL);
void
gtk_combo_disable_activate (GtkCombo* combo)
{
- g_return_if_fail (combo != NULL);
g_return_if_fail (GTK_IS_COMBO (combo));
if ( combo->activate_id ) {
- gtk_signal_disconnect(GTK_OBJECT(combo->entry), combo->activate_id);
+ gtk_signal_disconnect (GTK_OBJECT(combo->entry), combo->activate_id);
combo->activate_id = 0;
}
}
+
+static void
+gtk_combo_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkCombo *combo = GTK_COMBO (object);
+
+ switch (prop_id)
+ {
+ case PROP_ENABLE_ARROW_KEYS:
+ /* This call does the notification */
+ gtk_combo_set_use_arrows (combo, g_value_get_boolean (value));
+ break;
+ case PROP_ENABLE_ARROWS_ALWAYS:
+ /* This call does the notification */
+ gtk_combo_set_use_arrows_always (combo, g_value_get_boolean (value));
+ break;
+ case PROP_CASE_SENSITIVE:
+ /* This call does the notification */
+ gtk_combo_set_case_sensitive (combo, g_value_get_boolean (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+
+}
+
+static void
+gtk_combo_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkCombo *combo = GTK_COMBO (object);
+
+ switch (prop_id)
+ {
+ case PROP_ENABLE_ARROW_KEYS:
+ g_value_set_boolean (value, combo->use_arrows);
+ break;
+ case PROP_ENABLE_ARROWS_ALWAYS:
+ g_value_set_boolean (value, combo->use_arrows_always);
+ break;
+ case PROP_CASE_SENSITIVE:
+ g_value_set_boolean (value, combo->case_sensitive);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+
+}
projects / ~andy / gtk / blobdiff