graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-20 19:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

app: GimpScaleComboBox: don't derive from GtkComboBoxEntry

Browse source 
because it's deprecated. Derive from GtkComboBox directly, use the
"has-entry" property and move the setup code from init() to
constructed().
This commit is contained in:
Michael Natterer 2011-04-18 21:49:23 +02:00
parent 4d3e6b062d
commit 85509f4ffb
2 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/display/gimpscalecombobox.c
View file

@ -52,6 +52,7 @@ enum
};
static void gimp_scale_combo_box_constructed (GObject *object);
static void gimp_scale_combo_box_finalize (GObject *object);
static void gimp_scale_combo_box_style_set (GtkWidget *widget,
@ -71,7 +72,7 @@ static void gimp_scale_combo_box_scale_iter_set (GtkListStore *store,
G_DEFINE_TYPE (GimpScaleComboBox, gimp_scale_combo_box,
GTK_TYPE_COMBO_BOX_ENTRY)
GTK_TYPE_COMBO_BOX)
#define parent_class gimp_scale_combo_box_parent_class
@ -93,11 +94,12 @@ gimp_scale_combo_box_class_init (GimpScaleComboBoxClass *klass)
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
object_class->finalize = gimp_scale_combo_box_finalize;
object_class->constructed = gimp_scale_combo_box_constructed;
object_class->finalize = gimp_scale_combo_box_finalize;
widget_class->style_set = gimp_scale_combo_box_style_set;
widget_class->style_set = gimp_scale_combo_box_style_set;
klass->entry_activated = NULL;
klass->entry_activated = NULL;
gtk_widget_class_install_style_property (widget_class,
g_param_spec_double ("label-scale",
@ -111,16 +113,24 @@ gimp_scale_combo_box_class_init (GimpScaleComboBoxClass *klass)
static void
gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
{
GtkWidget *entry;
GtkListStore *store;
GtkCellLayout *layout;
GtkCellRenderer *cell;
GtkTreeIter iter;
GtkBorder border = { 0, 0, 0, 0 };
gint i;
combo_box->scale = 1.0;
combo_box->last_path = NULL;
}
static void
gimp_scale_combo_box_constructed (GObject *object)
{
GimpScaleComboBox *combo_box = GIMP_SCALE_COMBO_BOX (object);
GtkWidget *entry;
GtkListStore *store;
GtkCellLayout *layout;
GtkCellRenderer *cell;
GtkTreeIter iter;
GtkBorder border = { 0, 0, 0, 0 };
gint i;
if (G_OBJECT_CLASS (parent_class)->constructed)
G_OBJECT_CLASS (parent_class)->constructed (object);
store = gtk_list_store_new (N_COLUMNS,
G_TYPE_DOUBLE, /* SCALE */
@ -130,7 +140,7 @@ gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
gtk_combo_box_set_model (GTK_COMBO_BOX (combo_box), GTK_TREE_MODEL (store));
g_object_unref (store);
gtk_combo_box_entry_set_text_column (GTK_COMBO_BOX_ENTRY (combo_box),
gtk_combo_box_set_entry_text_column (GTK_COMBO_BOX (combo_box),
COLUMN_LABEL);
entry = gtk_bin_get_child (GTK_BIN (combo_box));
@ -452,7 +462,9 @@ gimp_scale_combo_box_mru_remove_last (GimpScaleComboBox *combo_box)
GtkWidget *
gimp_scale_combo_box_new (void)
{
return g_object_new (GIMP_TYPE_SCALE_COMBO_BOX, NULL);
return g_object_new (GIMP_TYPE_SCALE_COMBO_BOX,
"has-entry", TRUE,
NULL);
}
void

20
app/display/gimpscalecombobox.h
View file

@ -22,16 +22,6 @@
#define __GIMP_SCALE_COMBO_BOX_H__
#if GTK_CHECK_VERSION(2,23,1)
#undef GTK_DISABLE_DEPRECATED
#undef GTK_DISABLE_SINGLE_INCLUDES
#undef __GTK_COMBO_BOX_ENTRY_H__
#include <gtk/gtkcomboboxentry.h>
#define GTK_DISABLE_SINGLE_INCLUDES
#define GTK_DISABLE_DEPRECATED
#endif
#define GIMP_TYPE_SCALE_COMBO_BOX (gimp_scale_combo_box_get_type ())
#define GIMP_SCALE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBox))
#define GIMP_SCALE_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBoxClass))
@ -44,18 +34,18 @@ typedef struct _GimpScaleComboBoxClass GimpScaleComboBoxClass;
struct _GimpScaleComboBoxClass
{
GtkComboBoxEntryClass parent_instance;
GtkComboBoxClass parent_instance;
void (* entry_activated) (GimpScaleComboBox *combo_box);
};
struct _GimpScaleComboBox
{
GtkComboBoxEntry parent_instance;
GtkComboBox parent_instance;
gdouble scale;
GtkTreePath *last_path;
GList *mru;
gdouble scale;
GtkTreePath *last_path;
GList *mru;
};