AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-18 17:30:10 +00:00
Code Issues Projects Releases Wiki Activity

gtkcellrenderercombo: Move public members to private structure

Browse Source
This commit is contained in:
Javier Jardón 2010-06-01 14:40:52 +02:00
parent 5e815bfee2
commit c0b0b84c6e
2 changed files with 67 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
gtk/gtkcellrenderercombo.c
View File

@ -31,12 +31,17 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#define GTK_CELL_RENDERER_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererComboPrivate)) struct _GtkCellRendererComboPriv
typedef struct _GtkCellRendererComboPrivate GtkCellRendererComboPrivate;
struct _GtkCellRendererComboPrivate
{ {
GtkTreeModel *model;
GtkWidget *combo; GtkWidget *combo;
gboolean has_entry;
gint text_column;
guint focus_out_id;
}; };
@ -182,16 +187,23 @@ gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass)
G_TYPE_STRING, G_TYPE_STRING,
GTK_TYPE_TREE_ITER); GTK_TYPE_TREE_ITER);
g_type_class_add_private (klass, sizeof (GtkCellRendererComboPrivate)); g_type_class_add_private (klass, sizeof (GtkCellRendererComboPriv));
} }
static void static void
gtk_cell_renderer_combo_init (GtkCellRendererCombo *self) gtk_cell_renderer_combo_init (GtkCellRendererCombo *self)
{ {
self->model = NULL; GtkCellRendererComboPriv *priv;
self->text_column = -1;
self->has_entry = TRUE; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
self->focus_out_id = 0; GTK_TYPE_CELL_RENDERER_COMBO,
GtkCellRendererComboPriv);
priv = self->priv;
priv->model = NULL;
priv->text_column = -1;
priv->has_entry = TRUE;
priv->focus_out_id = 0;
} }
/** /**
@ -219,11 +231,12 @@ static void
gtk_cell_renderer_combo_finalize (GObject *object) gtk_cell_renderer_combo_finalize (GObject *object)
{ {
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object); GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
GtkCellRendererComboPriv *priv = cell->priv;
if (cell->model) if (priv->model)
{ {
g_object_unref (cell->model); g_object_unref (priv->model);
cell->model = NULL; priv->model = NULL;
} }
G_OBJECT_CLASS (gtk_cell_renderer_combo_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_cell_renderer_combo_parent_class)->finalize (object);
@ -236,17 +249,18 @@ gtk_cell_renderer_combo_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object); GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
GtkCellRendererComboPriv *priv = cell->priv;
switch (prop_id) switch (prop_id)
{ {
case PROP_MODEL: case PROP_MODEL:
g_value_set_object (value, cell->model); g_value_set_object (value, priv->model);
break; break;
case PROP_TEXT_COLUMN: case PROP_TEXT_COLUMN:
g_value_set_int (value, cell->text_column); g_value_set_int (value, priv->text_column);
break; break;
case PROP_HAS_ENTRY: case PROP_HAS_ENTRY:
g_value_set_boolean (value, cell->has_entry); g_value_set_boolean (value, priv->has_entry);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -261,27 +275,24 @@ gtk_cell_renderer_combo_set_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object); GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
GtkCellRendererComboPriv *priv = cell->priv;
switch (prop_id) switch (prop_id)
{ {
case PROP_MODEL: case PROP_MODEL:
{ {
GtkCellRendererComboPrivate *priv; if (priv->model)
g_object_unref (priv->model);
priv = GTK_CELL_RENDERER_COMBO_GET_PRIVATE (cell); priv->model = GTK_TREE_MODEL (g_value_get_object (value));
if (priv->model)
if (cell->model) g_object_ref (priv->model);
g_object_unref (cell->model);
cell->model = GTK_TREE_MODEL (g_value_get_object (value));
if (cell->model)
g_object_ref (cell->model);
break; break;
} }
case PROP_TEXT_COLUMN: case PROP_TEXT_COLUMN:
cell->text_column = g_value_get_int (value); priv->text_column = g_value_get_int (value);
break; break;
case PROP_HAS_ENTRY: case PROP_HAS_ENTRY:
cell->has_entry = g_value_get_boolean (value); priv->has_entry = g_value_get_boolean (value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -319,15 +330,15 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo,
GtkCellRendererCombo *cell; GtkCellRendererCombo *cell;
GtkEntry *entry; GtkEntry *entry;
gboolean canceled; gboolean canceled;
GtkCellRendererComboPrivate *priv; GtkCellRendererComboPriv *priv;
cell = GTK_CELL_RENDERER_COMBO (data); cell = GTK_CELL_RENDERER_COMBO (data);
priv = GTK_CELL_RENDERER_COMBO_GET_PRIVATE (data); priv = cell->priv;
if (cell->focus_out_id > 0) if (priv->focus_out_id > 0)
{ {
g_signal_handler_disconnect (combo, cell->focus_out_id); g_signal_handler_disconnect (combo, priv->focus_out_id);
cell->focus_out_id = 0; priv->focus_out_id = 0;
} }
g_object_get (combo, g_object_get (combo,
@ -351,7 +362,7 @@ gtk_cell_renderer_combo_editing_done (GtkCellEditable *combo,
if (model if (model
&& gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter)) && gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
gtk_tree_model_get (model, &iter, cell->text_column, &new_text, -1); gtk_tree_model_get (model, &iter, priv->text_column, &new_text, -1);
} }
path = g_object_get_data (G_OBJECT (combo), GTK_CELL_RENDERER_COMBO_PATH); path = g_object_get_data (G_OBJECT (combo), GTK_CELL_RENDERER_COMBO_PATH);
@ -386,10 +397,13 @@ find_text (GtkTreeModel *model,
GtkTreeIter *iter, GtkTreeIter *iter,
gpointer data) gpointer data)
{ {
GtkCellRendererComboPriv *priv;
SearchData *search_data = (SearchData *)data; SearchData *search_data = (SearchData *)data;
gchar *text; gchar *text;
gtk_tree_model_get (model, iter, search_data->cell->text_column, &text, -1); priv = search_data->cell->priv;
gtk_tree_model_get (model, iter, priv->text_column, &text, -1);
if (text && GTK_CELL_RENDERER_TEXT (search_data->cell)->text && if (text && GTK_CELL_RENDERER_TEXT (search_data->cell)->text &&
strcmp (text, GTK_CELL_RENDERER_TEXT (search_data->cell)->text) == 0) strcmp (text, GTK_CELL_RENDERER_TEXT (search_data->cell)->text) == 0)
{ {
@ -415,26 +429,26 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
GtkCellRendererText *cell_text; GtkCellRendererText *cell_text;
GtkWidget *combo; GtkWidget *combo;
SearchData search_data; SearchData search_data;
GtkCellRendererComboPrivate *priv; GtkCellRendererComboPriv *priv;
cell_text = GTK_CELL_RENDERER_TEXT (cell); cell_text = GTK_CELL_RENDERER_TEXT (cell);
if (cell_text->editable == FALSE) if (cell_text->editable == FALSE)
return NULL; return NULL;
cell_combo = GTK_CELL_RENDERER_COMBO (cell); cell_combo = GTK_CELL_RENDERER_COMBO (cell);
if (cell_combo->text_column < 0) priv = cell_combo->priv;
if (priv->text_column < 0)
return NULL; return NULL;
priv = GTK_CELL_RENDERER_COMBO_GET_PRIVATE (cell_combo); if (priv->has_entry)
if (cell_combo->has_entry)
{ {
combo = gtk_combo_box_entry_new (); combo = gtk_combo_box_entry_new ();
if (cell_combo->model) if (priv->model)
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), cell_combo->model); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), priv->model);
gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo), gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo),
cell_combo->text_column); priv->text_column);
if (cell_text->text) if (cell_text->text)
gtk_entry_set_text (GTK_ENTRY (GTK_BIN (combo)->child), gtk_entry_set_text (GTK_ENTRY (GTK_BIN (combo)->child),
@ -445,20 +459,20 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
combo = gtk_combo_box_new (); combo = gtk_combo_box_new ();
if (cell_combo->model) if (priv->model)
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), cell_combo->model); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), priv->model);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo),
cell, "text", cell_combo->text_column, cell, "text", priv->text_column,
NULL); NULL);
/* determine the current value */ /* determine the current value */
if (cell_combo->model) if (priv->model)
{ {
search_data.cell = cell_combo; search_data.cell = cell_combo;
search_data.found = FALSE; search_data.found = FALSE;
gtk_tree_model_foreach (cell_combo->model, find_text, &search_data); gtk_tree_model_foreach (priv->model, find_text, &search_data);
if (search_data.found) if (search_data.found)
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo),
&(search_data.iter)); &(search_data.iter));
@ -478,8 +492,7 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
g_signal_connect (GTK_CELL_EDITABLE (combo), "changed", g_signal_connect (GTK_CELL_EDITABLE (combo), "changed",
G_CALLBACK (gtk_cell_renderer_combo_changed), G_CALLBACK (gtk_cell_renderer_combo_changed),
cell_combo); cell_combo);
cell_combo->focus_out_id = priv->focus_out_id = g_signal_connect (combo, "focus-out-event",
g_signal_connect (combo, "focus-out-event",
G_CALLBACK (gtk_cell_renderer_combo_focus_out_event), G_CALLBACK (gtk_cell_renderer_combo_focus_out_event),
cell_combo); cell_combo);

7
gtk/gtkcellrenderercombo.h
View File

@ -37,18 +37,15 @@ G_BEGIN_DECLS
#define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass)) #define GTK_CELL_RENDERER_COMBO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_COMBO, GtkCellRendererTextClass))
typedef struct _GtkCellRendererCombo GtkCellRendererCombo; typedef struct _GtkCellRendererCombo GtkCellRendererCombo;
typedef struct _GtkCellRendererComboPriv GtkCellRendererComboPriv;
typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass; typedef struct _GtkCellRendererComboClass GtkCellRendererComboClass;
struct _GtkCellRendererCombo struct _GtkCellRendererCombo
{ {
GtkCellRendererText parent; GtkCellRendererText parent;
GtkTreeModel *GSEAL (model);
gint GSEAL (text_column);
gboolean GSEAL (has_entry);
/* <private> */ /* <private> */
guint GSEAL (focus_out_id); GtkCellRendererComboPriv *priv;
}; };
struct _GtkCellRendererComboClass struct _GtkCellRendererComboClass