* Lesser General Public License for more details.
*
* 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkcellrenderercombo.h"
#include "gtkcellrenderertext.h"
#include "gtkcombobox.h"
-#include "gtkcomboboxentry.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
-struct _GtkCellRendererComboPriv
+
+/**
+ * SECTION:gtkcellrenderercombo
+ * @Short_description: Renders a combobox in a cell
+ * @Title: GtkCellRendererCombo
+ *
+ * #GtkCellRendererCombo renders text in a cell like #GtkCellRendererText from
+ * which it is derived. But while #GtkCellRendererText offers a simple entry to
+ * edit the text, #GtkCellRendererCombo offers a #GtkComboBox
+ * widget to edit the text. The values to display in the combo box are taken from
+ * the tree model specified in the #GtkCellRendererCombo:model property.
+ *
+ * The combo cell renderer takes care of adding a text cell renderer to the combo
+ * box and sets it to display the column specified by its
+ * #GtkCellRendererCombo:text-column property. Further properties of the combo box
+ * can be set in a handler for the #GtkCellRenderer::editing-started signal.
+ *
+ * The #GtkCellRendererCombo cell renderer was added in GTK+ 2.6.
+ */
+
+
+struct _GtkCellRendererComboPrivate
{
GtkTreeModel *model;
gint text_column;
- guint focus_out_id;
+ gulong focus_out_id;
};
GParamSpec *pspec);
static GtkCellEditable *gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
- GdkEvent *event,
- GtkWidget *widget,
- const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GtkCellRendererState flags);
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags);
enum {
PROP_0,
G_TYPE_STRING,
GTK_TYPE_TREE_ITER);
- g_type_class_add_private (klass, sizeof (GtkCellRendererComboPriv));
+ g_type_class_add_private (klass, sizeof (GtkCellRendererComboPrivate));
}
static void
gtk_cell_renderer_combo_init (GtkCellRendererCombo *self)
{
- GtkCellRendererComboPriv *priv;
+ GtkCellRendererComboPrivate *priv;
self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
GTK_TYPE_CELL_RENDERER_COMBO,
- GtkCellRendererComboPriv);
+ GtkCellRendererComboPrivate);
priv = self->priv;
priv->model = NULL;
gtk_cell_renderer_combo_finalize (GObject *object)
{
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
- GtkCellRendererComboPriv *priv = cell->priv;
+ GtkCellRendererComboPrivate *priv = cell->priv;
if (priv->model)
{
GParamSpec *pspec)
{
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
- GtkCellRendererComboPriv *priv = cell->priv;
+ GtkCellRendererComboPrivate *priv = cell->priv;
switch (prop_id)
{
GParamSpec *pspec)
{
GtkCellRendererCombo *cell = GTK_CELL_RENDERER_COMBO (object);
- GtkCellRendererComboPriv *priv = cell->priv;
+ GtkCellRendererComboPrivate *priv = cell->priv;
switch (prop_id)
{
GtkCellRendererCombo *cell;
GtkEntry *entry;
gboolean canceled;
- GtkCellRendererComboPriv *priv;
+ GtkCellRendererComboPrivate *priv;
cell = GTK_CELL_RENDERER_COMBO (data);
priv = cell->priv;
return;
}
- if (GTK_IS_COMBO_BOX_ENTRY (combo))
+ if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo)))
{
entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo)));
new_text = g_strdup (gtk_entry_get_text (entry));
GtkTreeIter *iter,
gpointer data)
{
- GtkCellRendererComboPriv *priv;
+ GtkCellRendererComboPrivate *priv;
SearchData *search_data = (SearchData *)data;
- gchar *text;
+ gchar *text, *cell_text;
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 &&
- strcmp (text, GTK_CELL_RENDERER_TEXT (search_data->cell)->text) == 0)
+ g_object_get (GTK_CELL_RENDERER_TEXT (search_data->cell),
+ "text", &cell_text,
+ NULL);
+ if (text && cell_text && g_strcmp0 (text, cell_text) == 0)
{
search_data->iter = *iter;
search_data->found = TRUE;
}
+ g_free (cell_text);
g_free (text);
return search_data->found;
static GtkCellEditable *
gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
- GdkEvent *event,
- GtkWidget *widget,
- const gchar *path,
- GdkRectangle *background_area,
- GdkRectangle *cell_area,
- GtkCellRendererState flags)
+ GdkEvent *event,
+ GtkWidget *widget,
+ const gchar *path,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
{
GtkCellRendererCombo *cell_combo;
GtkCellRendererText *cell_text;
GtkWidget *combo;
SearchData search_data;
- GtkCellRendererComboPriv *priv;
+ GtkCellRendererComboPrivate *priv;
+ gboolean editable;
+ gchar *text;
cell_text = GTK_CELL_RENDERER_TEXT (cell);
- if (cell_text->editable == FALSE)
+ g_object_get (cell_text, "editable", &editable, NULL);
+ if (editable == FALSE)
return NULL;
cell_combo = GTK_CELL_RENDERER_COMBO (cell);
if (priv->has_entry)
{
- combo = gtk_combo_box_entry_new ();
+ combo = g_object_new (GTK_TYPE_COMBO_BOX, "has-entry", TRUE, NULL);
if (priv->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_set_entry_text_column (GTK_COMBO_BOX (combo),
priv->text_column);
- if (cell_text->text)
- gtk_entry_set_text (GTK_ENTRY (GTK_BIN (combo)->child),
- cell_text->text);
+ g_object_get (cell_text, "text", &text, NULL);
+ if (text)
+ gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))),
+ text);
+ g_free (text);
}
else
{
projects / ~andy / gtk / blobdiff