dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: get rid of some GtkObject variables, makes the gtk3-port diff smaller

This commit is contained in:
Michael Natterer 2014-07-21 02:34:39 +02:00
parent 1859633018
commit cf159ac68a
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/widgets/gimpcombotagentry.c
View File

@ -52,7 +52,7 @@ static void gimp_combo_tag_entry_icon_press (GtkWidget *wi
GdkEvent *event,
gpointer user_data);
static void gimp_combo_tag_entry_popup_destroy (GtkObject *object,
static void gimp_combo_tag_entry_popup_destroy (GtkWidget *widget,
GimpComboTagEntry *entry);
static void gimp_combo_tag_entry_tag_count_changed (GimpTaggedContainer *container,
@ -291,7 +291,7 @@ gimp_combo_tag_entry_icon_press (GtkWidget *widget,
}
static void
gimp_combo_tag_entry_popup_destroy (GtkObject *object,
gimp_combo_tag_entry_popup_destroy (GtkWidget *widget,
GimpComboTagEntry *entry)
{
entry->popup = NULL;

19
app/widgets/gimppropwidgets.c
View File

@ -478,12 +478,12 @@ gimp_prop_spin_scale_new (GObject *config,
gdouble page_increment,
gint digits)
{
GParamSpec *param_spec;
GtkObject *adjustment;
GtkWidget *scale;
gdouble value;
gdouble lower;
gdouble upper;
GParamSpec *param_spec;
GtkAdjustment *adjustment;
GtkWidget *scale;
gdouble value;
gdouble lower;
gdouble upper;
param_spec = find_param_spec (config, property_name, G_STRFUNC);
if (! param_spec)
@ -500,10 +500,11 @@ gimp_prop_spin_scale_new (GObject *config,
if (! label)
label = g_param_spec_get_nick (param_spec);
adjustment = gtk_adjustment_new (value, lower, upper,
step_increment, page_increment, 0.0);
adjustment = (GtkAdjustment *)
gtk_adjustment_new (value, lower, upper,
step_increment, page_increment, 0.0);
scale = gimp_spin_scale_new (GTK_ADJUSTMENT (adjustment), label, digits);
scale = gimp_spin_scale_new (adjustment, label, digits);
set_param_spec (G_OBJECT (adjustment), scale, param_spec);

6
app/widgets/gimpuimanager.c
View File

@ -97,7 +97,7 @@ static void gimp_ui_manager_menu_pos (GtkMenu *menu,
gint *y,
gboolean *push_in,
gpointer data);
static void gimp_ui_manager_delete_popdown_data (GtkObject *object,
static void gimp_ui_manager_delete_popdown_data (GtkWidget *widget,
GimpUIManager *manager);
static void gimp_ui_manager_item_realize (GtkWidget *widget,
GimpUIManager *manager);
@ -857,10 +857,10 @@ gimp_ui_manager_menu_pos (GtkMenu *menu,
}
static void
gimp_ui_manager_delete_popdown_data (GtkObject *object,
gimp_ui_manager_delete_popdown_data (GtkWidget *widget,
GimpUIManager *manager)
{
g_signal_handlers_disconnect_by_func (object,
g_signal_handlers_disconnect_by_func (widget,
gimp_ui_manager_delete_popdown_data,
manager);
g_object_set_data (G_OBJECT (manager), "popdown-data", NULL);