* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gtkcombobox.h"
#include "gtkarrow.h"
GSList *cells;
guint popup_in_progress : 1;
+ guint destroying : 1;
};
/* While debugging this evil code, I have learned that
gpointer data);
static void gtk_combo_box_add (GtkContainer *container,
GtkWidget *widget);
+static void gtk_combo_box_remove (GtkContainer *container,
+ GtkWidget *widget);
static ComboCellInfo *gtk_combo_box_get_cell_info (GtkComboBox *combo_box,
GtkCellRenderer *cell);
static void gtk_combo_box_remeasure (GtkComboBox *combo_box);
static void gtk_combo_box_unset_model (GtkComboBox *combo_box);
-static void gtk_combo_box_set_model_internal (GtkComboBox *combo_box);
static void gtk_combo_box_size_request (GtkWidget *widget,
GtkRequisition *requisition);
GdkEventScroll *event);
static void gtk_combo_box_set_active_internal (GtkComboBox *combo_box,
gint index);
+static gboolean gtk_combo_box_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
/* listening to the model */
static void gtk_combo_box_model_row_inserted (GtkTreeModel *model,
/* menu */
static void gtk_combo_box_menu_setup (GtkComboBox *combo_box,
- gboolean add_childs);
+ gboolean add_children);
static void gtk_combo_box_menu_fill (GtkComboBox *combo_box);
static void gtk_combo_box_menu_destroy (GtkComboBox *combo_box);
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
+static gboolean gtk_combo_box_menu_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data);
/* cell layout */
static void gtk_combo_box_cell_layout_pack_start (GtkCellLayout *layout,
static gboolean gtk_combo_box_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling);
+static void cell_view_sync_cells (GtkComboBox *combo_box,
+ GtkCellView *cell_view);
GType
gtk_combo_box_get_type (void)
container_class = (GtkContainerClass *)klass;
container_class->forall = gtk_combo_box_forall;
container_class->add = gtk_combo_box_add;
+ container_class->remove = gtk_combo_box_remove;
widget_class = (GtkWidgetClass *)klass;
widget_class->size_allocate = gtk_combo_box_size_allocate;
combo_box->priv = GTK_COMBO_BOX_GET_PRIVATE (combo_box);
combo_box->priv->cell_view = gtk_cell_view_new ();
- gtk_container_add (GTK_CONTAINER (combo_box), combo_box->priv->cell_view);
+ gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (combo_box));
+ GTK_BIN (combo_box)->child = combo_box->priv->cell_view;
gtk_widget_show (combo_box->priv->cell_view);
combo_box->priv->width = 0;
}
static void
-gtk_combo_box_style_set (GtkWidget *widget,
- GtkStyle *previous)
+gtk_combo_box_check_appearance (GtkComboBox *combo_box)
{
- gboolean appearance;
- GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
+ gboolean appears_as_list;
- gtk_widget_queue_resize (widget);
-
/* if wrap_width > 0, then we are in grid-mode and forced to use
* unix style
*/
if (combo_box->priv->wrap_width)
- return;
-
- gtk_widget_style_get (widget,
- "appears-as-list", &appearance,
- NULL);
+ appears_as_list = FALSE;
+ else
+ gtk_widget_style_get (GTK_WIDGET (combo_box),
+ "appears-as-list", &appears_as_list,
+ NULL);
- /* TRUE is windows style */
- if (appearance)
+ if (appears_as_list)
{
/* Destroy all the menu mode widgets, if they exist. */
if (GTK_IS_MENU (combo_box->priv->popup_widget))
if (!GTK_IS_MENU (combo_box->priv->popup_widget))
gtk_combo_box_menu_setup (combo_box, TRUE);
}
+}
+
+static void
+gtk_combo_box_style_set (GtkWidget *widget,
+ GtkStyle *previous)
+{
+ GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
+
+ gtk_combo_box_check_appearance (combo_box);
if (combo_box->priv->tree_view && combo_box->priv->cell_view)
gtk_cell_view_set_background_color (GTK_CELL_VIEW (combo_box->priv->cell_view),
&widget->style->base[GTK_WIDGET_STATE (widget)]);
-
}
static void
GtkComboBox *combo_box = GTK_COMBO_BOX (container);
if (combo_box->priv->cell_view && combo_box->priv->cell_view->parent)
- gtk_container_remove (container, combo_box->priv->cell_view);
-
- (* GTK_CONTAINER_CLASS (parent_class)->add) (container, widget);
+ {
+ gtk_widget_unparent (combo_box->priv->cell_view);
+ GTK_BIN (container)->child = NULL;
+ gtk_widget_queue_resize (GTK_WIDGET (container));
+ }
+
+ gtk_widget_set_parent (widget, GTK_WIDGET (container));
+ GTK_BIN (container)->child = widget;
if (combo_box->priv->cell_view &&
widget != combo_box->priv->cell_view)
}
}
+static void
+gtk_combo_box_remove (GtkContainer *container,
+ GtkWidget *widget)
+{
+ GtkComboBox *combo_box = GTK_COMBO_BOX (container);
+ gboolean appears_as_list;
+
+ gtk_widget_unparent (widget);
+ GTK_BIN (container)->child = NULL;
+
+ if (combo_box->priv->destroying)
+ return;
+
+ gtk_widget_queue_resize (GTK_WIDGET (container));
+
+ if (!combo_box->priv->tree_view)
+ appears_as_list = FALSE;
+ else
+ appears_as_list = TRUE;
+
+ if (appears_as_list)
+ gtk_combo_box_list_destroy (combo_box);
+ else if (GTK_IS_MENU (combo_box->priv->popup_widget))
+ {
+ gtk_combo_box_menu_destroy (combo_box);
+ gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget));
+ combo_box->priv->popup_widget = NULL;
+ }
+
+ if (!combo_box->priv->cell_view)
+ {
+ combo_box->priv->cell_view = gtk_cell_view_new ();
+ gtk_widget_set_parent (combo_box->priv->cell_view, GTK_WIDGET (container));
+ GTK_BIN (container)->child = combo_box->priv->cell_view;
+
+ gtk_widget_show (combo_box->priv->cell_view);
+ gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
+ combo_box->priv->model);
+ cell_view_sync_cells (combo_box, GTK_CELL_VIEW (combo_box->priv->cell_view));
+ }
+
+
+ if (appears_as_list)
+ gtk_combo_box_list_setup (combo_box);
+ else
+ gtk_combo_box_menu_setup (combo_box, TRUE);
+
+ gtk_combo_box_set_active_internal (combo_box, combo_box->priv->active_item);
+}
+
static ComboCellInfo *
gtk_combo_box_get_cell_info (GtkComboBox *combo_box,
GtkCellRenderer *cell)
gtk_widget_size_request (GTK_WIDGET (menu), &req);
- if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_RTL)
+ if (gtk_widget_get_direction (GTK_WIDGET (combo_box)) == GTK_TEXT_DIR_LTR)
*x = sx;
else
*x = sx + child->allocation.width - req.width;
gpointer user_data)
{
GtkComboBox *combo_box;
+ GtkWidget *menu_item;
combo_box = GTK_COMBO_BOX (user_data);
if (combo_box->priv->wrap_width > 0 || combo_box->priv->cell_view == NULL)
gtk_combo_box_menu_position_below (menu, x, y, push_in, user_data);
else
- gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data);
+ {
+ menu_item = gtk_menu_get_active (GTK_MENU (combo_box->priv->popup_widget));
+ if (menu_item)
+ gtk_menu_shell_select_item (GTK_MENU_SHELL (combo_box->priv->popup_widget),
+ menu_item);
+
+ gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data);
+ }
}
gtk_combo_box_popup (GtkComboBox *combo_box)
{
gint x, y, width, height;
-
+
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
if (GTK_WIDGET_MAPPED (combo_box->priv->popup_widget))
if (combo_box->priv->cell_view)
{
- GtkRequisition sep_req, arrow_req;
+ GtkRequisition button_req, sep_req, arrow_req;
gint border_width, xthickness, ythickness;
+ gtk_widget_size_request (combo_box->priv->button, &button_req);
border_width = GTK_CONTAINER (combo_box->priv->button)->border_width;
xthickness = combo_box->priv->button->style->xthickness;
ythickness = combo_box->priv->button->style->ythickness;
width = bin_req.width + sep_req.width + arrow_req.width;
- height += border_width + 1 + xthickness * 2 + 4;
- width += border_width + 1 + ythickness * 2 + 4;
+ height += border_width + 1 + ythickness * 2 + 4;
+ width += border_width + 1 + xthickness * 2 + 4;
requisition->width = width;
requisition->height = height;
else
{
/* list mode */
- GtkRequisition button_req;
+ GtkRequisition button_req, frame_req;
/* sample + frame */
*requisition = bin_req;
if (combo_box->priv->cell_view_frame)
{
+ gtk_widget_size_request (combo_box->priv->cell_view_frame, &frame_req);
requisition->width += 2 *
(GTK_CONTAINER (combo_box->priv->cell_view_frame)->border_width +
GTK_WIDGET (combo_box->priv->cell_view_frame)->style->xthickness);
width = allocation->width - (border_width + 1 + xthickness * 2 + 4);
- /* handle the childs */
+ /* handle the children */
gtk_widget_size_request (combo_box->priv->arrow, &req);
child.width = req.width;
child.height = allocation->height - 2 * (child.y - allocation->y);
static void
gtk_combo_box_unset_model (GtkComboBox *combo_box)
{
- if (combo_box->priv->inserted_id != -1)
+ if (combo_box->priv->model)
{
g_signal_handler_disconnect (combo_box->priv->model,
combo_box->priv->inserted_id);
- combo_box->priv->inserted_id = -1;
- }
- if (combo_box->priv->deleted_id != -1)
- {
g_signal_handler_disconnect (combo_box->priv->model,
combo_box->priv->deleted_id);
- combo_box->priv->deleted_id = -1;
- }
- if (combo_box->priv->reordered_id != -1)
- {
g_signal_handler_disconnect (combo_box->priv->model,
combo_box->priv->reordered_id);
- combo_box->priv->reordered_id = -1;
- }
- if (combo_box->priv->changed_id != -1)
- {
g_signal_handler_disconnect (combo_box->priv->model,
combo_box->priv->changed_id);
- combo_box->priv->changed_id = -1;
}
/* menu mode */
gtk_container_foreach (GTK_CONTAINER (combo_box->priv->popup_widget),
(GtkCallback)gtk_widget_destroy, NULL);
}
-}
-static void
-gtk_combo_box_set_model_internal (GtkComboBox *combo_box)
-{
- combo_box->priv->inserted_id =
- g_signal_connect (combo_box->priv->model, "row_inserted",
- G_CALLBACK (gtk_combo_box_model_row_inserted),
- combo_box);
- combo_box->priv->deleted_id =
- g_signal_connect (combo_box->priv->model, "row_deleted",
- G_CALLBACK (gtk_combo_box_model_row_deleted),
- combo_box);
- combo_box->priv->reordered_id =
- g_signal_connect (combo_box->priv->model, "rows_reordered",
- G_CALLBACK (gtk_combo_box_model_rows_reordered),
- combo_box);
- combo_box->priv->changed_id =
- g_signal_connect (combo_box->priv->model, "row_changed",
- G_CALLBACK (gtk_combo_box_model_row_changed),
- combo_box);
-
- if (combo_box->priv->tree_view)
+ if (combo_box->priv->model)
{
- /* list mode */
- gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
- combo_box->priv->model);
+ g_object_unref (G_OBJECT (combo_box->priv->model));
+ combo_box->priv->model = NULL;
}
}
static void
gtk_combo_box_menu_setup (GtkComboBox *combo_box,
- gboolean add_childs)
+ gboolean add_children)
{
GtkWidget *box;
- /* Unset any existing model. */
- gtk_combo_box_unset_model (combo_box);
-
if (combo_box->priv->cell_view)
{
combo_box->priv->button = gtk_toggle_button_new ();
g_signal_connect (combo_box->priv->button, "toggled",
G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
+ g_signal_connect_after (combo_box->priv->button, "key_press_event",
+ G_CALLBACK (gtk_combo_box_key_press), combo_box);
gtk_widget_set_parent (combo_box->priv->button,
GTK_BIN (combo_box)->child->parent);
combo_box->priv->button = gtk_toggle_button_new ();
g_signal_connect (combo_box->priv->button, "toggled",
G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
+ g_signal_connect_after (combo_box, "key_press_event",
+ G_CALLBACK (gtk_combo_box_key_press), combo_box);
gtk_widget_set_parent (combo_box->priv->button,
GTK_BIN (combo_box)->child->parent);
/* create our funky menu */
box = gtk_menu_new ();
+ g_signal_connect (box, "key_press_event",
+ G_CALLBACK (gtk_combo_box_menu_key_press), combo_box);
gtk_combo_box_set_popup_widget (combo_box, box);
- /* set the models */
- gtk_combo_box_set_model_internal (combo_box);
-
/* add items */
- if (add_childs)
+ if (add_children)
gtk_combo_box_menu_fill (combo_box);
}
GTK_CELL_VIEW (GTK_BIN (tmp)->child));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), tmp);
+
+ if (combo_box->priv->wrap_width)
+ gtk_combo_box_relayout_item (combo_box, i);
+
gtk_widget_show (tmp);
gtk_tree_path_free (path);
static void
gtk_combo_box_menu_destroy (GtkComboBox *combo_box)
{
- /* disconnect signal handlers */
- gtk_combo_box_unset_model (combo_box);
-
g_signal_handlers_disconnect_matched (combo_box->priv->button,
G_SIGNAL_MATCH_DATA,
0, 0, NULL,
combo_box->priv->arrow = NULL;
}
- /* changing the popup window will unref the menu and the childs */
+ /* changing the popup window will unref the menu and the children */
}
/*
static void
gtk_combo_box_relayout (GtkComboBox *combo_box)
{
- gint i, items;
GList *list, *j;
GtkWidget *menu;
- /* ensure we are in menu style */
+ /* do nothing unless we are in menu style */
if (combo_box->priv->tree_view)
- gtk_combo_box_list_destroy (combo_box);
+ return;
menu = combo_box->priv->popup_widget;
- if (!GTK_IS_MENU_SHELL (menu))
- {
- gtk_combo_box_menu_setup (combo_box, FALSE);
- menu = combo_box->priv->popup_widget;
- }
-
/* get rid of all children */
g_return_if_fail (GTK_IS_MENU_SHELL (menu));
g_list_free (list);
/* and relayout */
- items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
-
- for (i = 0; i < items; i++)
- {
- GtkWidget *tmp;
- GtkTreePath *path;
-
- path = gtk_tree_path_new_from_indices (i, -1);
- tmp = gtk_cell_view_menu_item_new_from_model (combo_box->priv->model,
- path);
-
- g_signal_connect (tmp, "activate",
- G_CALLBACK (gtk_combo_box_menu_item_activate),
- combo_box);
-
- cell_view_sync_cells (combo_box, GTK_CELL_VIEW (GTK_BIN (tmp)->child));
-
- gtk_menu_shell_insert (GTK_MENU_SHELL (menu), tmp, i);
-
- if (combo_box->priv->wrap_width)
- gtk_combo_box_relayout_item (combo_box, i);
-
- gtk_widget_show (tmp);
-
- gtk_tree_path_free (path);
- }
+ gtk_combo_box_menu_fill (combo_box);
}
/* callbacks */
gtk_menu_set_active (GTK_MENU (combo_box->priv->popup_widget),
combo_box->priv->active_item);
+
gtk_menu_popup (GTK_MENU (combo_box->priv->popup_widget),
NULL, NULL,
gtk_combo_box_menu_position, combo_box,
{
GtkComboBox *combo_box = GTK_COMBO_BOX (user_data);
gint index = gtk_tree_path_get_indices (path)[0];
- gint items = gtk_tree_model_iter_n_children (model, NULL);
if (combo_box->priv->active_item >= index)
combo_box->priv->active_item++;
-
+
if (!combo_box->priv->tree_view)
gtk_combo_box_menu_row_inserted (model, path, iter, user_data);
-
- if (items == 1)
- gtk_combo_box_set_active (combo_box, 0);
}
static void
GSList *i;
GtkTreeSelection *sel;
- /* Unset any existing model. */
- gtk_combo_box_unset_model (combo_box);
-
combo_box->priv->button = gtk_toggle_button_new ();
gtk_widget_set_parent (combo_box->priv->button,
GTK_BIN (combo_box)->child->parent);
G_CALLBACK (gtk_combo_box_list_button_pressed), combo_box);
g_signal_connect (combo_box->priv->button, "toggled",
G_CALLBACK (gtk_combo_box_button_toggled), combo_box);
+ g_signal_connect_after (combo_box, "key_press_event",
+ G_CALLBACK (gtk_combo_box_key_press), combo_box);
combo_box->priv->arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
gtk_container_add (GTK_CONTAINER (combo_box->priv->button),
gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (combo_box->priv->tree_view),
FALSE);
-
+ if (combo_box->priv->model)
+ gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
+ combo_box->priv->model);
+
g_signal_connect (combo_box->priv->tree_view, "button_press_event",
G_CALLBACK (gtk_combo_box_list_button_pressed),
combo_box);
gtk_tree_view_append_column (GTK_TREE_VIEW (combo_box->priv->tree_view),
combo_box->priv->column);
- /* set the models */
- gtk_combo_box_set_model_internal (combo_box);
-
/* sync up */
for (i = combo_box->priv->cells; i; i = i->next)
{
gtk_combo_box_list_destroy (GtkComboBox *combo_box)
{
/* disconnect signals */
- gtk_combo_box_unset_model (combo_box);
-
g_signal_handlers_disconnect_matched (combo_box->priv->tree_view,
G_SIGNAL_MATCH_DATA,
0, 0, NULL, NULL, combo_box);
}
static gboolean
-gtk_combo_box_list_key_press (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+gtk_combo_box_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
{
GtkComboBox *combo_box = GTK_COMBO_BOX (data);
+ guint state = event->state & gtk_accelerator_get_default_mod_mask ();
+ gint items = gtk_tree_model_iter_n_children (combo_box->priv->model, NULL);
+ gint index = gtk_combo_box_get_active (combo_box);
+ gint new_index;
- if ((event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
- event->keyval == GDK_space || event->keyval == GDK_KP_Space) ||
- event->keyval == GDK_Escape)
+ if ((event->keyval == GDK_Down || event->keyval == GDK_KP_Down) &&
+ state == GDK_MOD1_MASK)
{
- if (event->keyval != GDK_Escape)
- {
- gboolean ret;
- GtkTreeIter iter;
- GtkTreeModel *model = NULL;
- GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
+ gtk_combo_box_popup (combo_box);
- ret = gtk_tree_selection_get_selected (sel, &model, &iter);
- if (ret)
- {
- GtkTreePath *path;
-
- path = gtk_tree_model_get_path (model, &iter);
- if (path)
- {
- gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]);
- gtk_tree_path_free (path);
- }
- }
- }
- else
- /* reset active item -- this is incredibly lame and ugly */
- gtk_combo_box_set_active (combo_box,
- gtk_combo_box_get_active (combo_box));
+ return TRUE;
+ }
+
+ switch (event->keyval)
+ {
+ case GDK_Down:
+ case GDK_KP_Down:
+ new_index = index + 1;
+ break;
+ case GDK_Up:
+ case GDK_KP_Up:
+ new_index = index - 1;
+ break;
+ case GDK_Page_Up:
+ case GDK_KP_Page_Up:
+ case GDK_Home:
+ case GDK_KP_Home:
+ new_index = 0;
+ break;
+ case GDK_Page_Down:
+ case GDK_KP_Page_Down:
+ case GDK_End:
+ case GDK_KP_End:
+ new_index = items - 1;
+ break;
+ default:
+ return FALSE;
+ }
+
+ gtk_combo_box_set_active (combo_box, CLAMP (new_index, 0, items - 1));
+
+ return TRUE;
+}
+
+static gboolean
+gtk_combo_box_menu_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
+{
+ GtkComboBox *combo_box = GTK_COMBO_BOX (data);
+ guint state = event->state & gtk_accelerator_get_default_mod_mask ();
+ if ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) &&
+ state == GDK_MOD1_MASK)
+ {
gtk_combo_box_popdown (combo_box);
return TRUE;
}
+
+ return FALSE;
+}
+
+static gboolean
+gtk_combo_box_list_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
+{
+ GtkComboBox *combo_box = GTK_COMBO_BOX (data);
+ guint state = event->state & gtk_accelerator_get_default_mod_mask ();
+
+ if (event->keyval == GDK_Escape ||
+ ((event->keyval == GDK_Up || event->keyval == GDK_KP_Up) &&
+ state == GDK_MOD1_MASK))
+ {
+ /* reset active item -- this is incredibly lame and ugly */
+ gtk_combo_box_set_active (combo_box,
+ gtk_combo_box_get_active (combo_box));
+
+ gtk_combo_box_popdown (combo_box);
+
+ return TRUE;
+ }
+
+ if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter ||
+ event->keyval == GDK_space || event->keyval == GDK_KP_Space)
+ {
+ gboolean ret;
+ GtkTreeIter iter;
+ GtkTreeModel *model = NULL;
+ GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (combo_box->priv->tree_view));
+
+ ret = gtk_tree_selection_get_selected (sel, &model, &iter);
+ if (ret)
+ {
+ GtkTreePath *path;
+
+ path = gtk_tree_model_get_path (model, &iter);
+ if (path)
+ {
+ gtk_combo_box_set_active (combo_box, gtk_tree_path_get_indices (path)[0]);
+ gtk_tree_path_free (path);
+ }
+ }
+
+ gtk_combo_box_popdown (combo_box);
+
+ return TRUE;
+ }
return FALSE;
}
if (width != combo_box->priv->wrap_width)
{
combo_box->priv->wrap_width = width;
-
+
+ gtk_combo_box_check_appearance (combo_box);
gtk_combo_box_relayout (combo_box);
- gtk_combo_box_style_set (GTK_WIDGET (combo_box), NULL);
g_object_notify (G_OBJECT (combo_box), "wrap_width");
}
g_return_if_fail (GTK_IS_COMBO_BOX (combo_box));
g_return_if_fail (GTK_IS_TREE_MODEL (model));
+ if (model == combo_box->priv->model)
+ return;
+
if (combo_box->priv->model)
- {
- gtk_combo_box_unset_model (combo_box);
- g_object_unref (G_OBJECT (combo_box->priv->model));
- }
+ gtk_combo_box_unset_model (combo_box);
combo_box->priv->model = model;
g_object_ref (G_OBJECT (combo_box->priv->model));
- gtk_combo_box_set_model_internal (combo_box);
- if (!combo_box->priv->tree_view && combo_box->priv->popup_widget)
- gtk_combo_box_menu_fill (combo_box);
+ combo_box->priv->inserted_id =
+ g_signal_connect (combo_box->priv->model, "row_inserted",
+ G_CALLBACK (gtk_combo_box_model_row_inserted),
+ combo_box);
+ combo_box->priv->deleted_id =
+ g_signal_connect (combo_box->priv->model, "row_deleted",
+ G_CALLBACK (gtk_combo_box_model_row_deleted),
+ combo_box);
+ combo_box->priv->reordered_id =
+ g_signal_connect (combo_box->priv->model, "rows_reordered",
+ G_CALLBACK (gtk_combo_box_model_rows_reordered),
+ combo_box);
+ combo_box->priv->changed_id =
+ g_signal_connect (combo_box->priv->model, "row_changed",
+ G_CALLBACK (gtk_combo_box_model_row_changed),
+ combo_box);
+
+ if (combo_box->priv->tree_view)
+ {
+ /* list mode */
+ gtk_tree_view_set_model (GTK_TREE_VIEW (combo_box->priv->tree_view),
+ combo_box->priv->model);
+ }
+ else
+ {
+ /* menu mode */
+ if (combo_box->priv->popup_widget)
+ gtk_combo_box_menu_fill (combo_box);
+
+ }
if (combo_box->priv->cell_view)
gtk_cell_view_set_model (GTK_CELL_VIEW (combo_box->priv->cell_view),
{
GtkComboBox *combo_box = GTK_COMBO_BOX (object);
+ combo_box->priv->destroying = 1;
+
GTK_OBJECT_CLASS (parent_class)->destroy (object);
combo_box->priv->cell_view = NULL;
+
+ combo_box->priv->destroying = 0;
}
static void
GtkComboBox *combo_box = GTK_COMBO_BOX (object);
GSList *i;
- gtk_combo_box_unset_model (combo_box);
-
if (GTK_IS_MENU (combo_box->priv->popup_widget))
gtk_combo_box_menu_destroy (combo_box);
if (combo_box->priv->popup_window)
gtk_widget_destroy (combo_box->priv->popup_window);
+ gtk_combo_box_unset_model (combo_box);
+
if (combo_box->priv->model)
g_object_unref (combo_box->priv->model);
projects / ~andy / gtk / blobdiff