callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgimpwidgets: add GDestroyNotify to gimp_widget_track_monitor()

Browse Source
This commit is contained in:
Michael Natterer
2019-08-07 23:44:18 +02:00
parent b4bccc9808
commit 1afb7a8b32
11 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/widgets/gimpcontainertreeview.c
View File

@ -230,7 +230,7 @@ gimp_container_tree_view_init (GimpContainerTreeView *tree_view)
gimp_widget_track_monitor (GTK_WIDGET (tree_view), gimp_widget_track_monitor (GTK_WIDGET (tree_view),
G_CALLBACK (gimp_container_tree_view_monitor_changed), G_CALLBACK (gimp_container_tree_view_monitor_changed),
NULL); NULL, NULL);
} }
static void static void

2
app/widgets/gimpfgbgeditor.c
View File

@ -195,7 +195,7 @@ gimp_fg_bg_editor_init (GimpFgBgEditor *editor)
gimp_widget_track_monitor (GTK_WIDGET (editor), gimp_widget_track_monitor (GTK_WIDGET (editor),
G_CALLBACK (gimp_fg_bg_editor_destroy_transform), G_CALLBACK (gimp_fg_bg_editor_destroy_transform),
NULL); NULL, NULL);
gtk_widget_set_size_request (GTK_WIDGET (editor), 32, 24); gtk_widget_set_size_request (GTK_WIDGET (editor), 32, 24);
} }

2
app/widgets/gimpfgbgview.c
View File

@ -98,7 +98,7 @@ gimp_fg_bg_view_init (GimpFgBgView *view)
gimp_widget_track_monitor (GTK_WIDGET (view), gimp_widget_track_monitor (GTK_WIDGET (view),
G_CALLBACK (gimp_fg_bg_view_destroy_transform), G_CALLBACK (gimp_fg_bg_view_destroy_transform),
NULL); NULL, NULL);
} }
static void static void

2
app/widgets/gimpview.c
View File

@ -190,7 +190,7 @@ gimp_view_init (GimpView *view)
gimp_widget_track_monitor (GTK_WIDGET (view), gimp_widget_track_monitor (GTK_WIDGET (view),
G_CALLBACK (gimp_view_monitor_changed), G_CALLBACK (gimp_view_monitor_changed),
NULL); NULL, NULL);
} }
static void static void

2
libgimpwidgets/gimpcolorarea.c
View File

@ -258,7 +258,7 @@ gimp_color_area_init (GimpColorArea *area)
gimp_widget_track_monitor (GTK_WIDGET (area), gimp_widget_track_monitor (GTK_WIDGET (area),
G_CALLBACK (gimp_color_area_destroy_transform), G_CALLBACK (gimp_color_area_destroy_transform),
NULL); NULL, NULL);
} }
static void static void

2
libgimpwidgets/gimpcolorscale.c
View File

@ -183,7 +183,7 @@ gimp_color_scale_init (GimpColorScale *scale)
gimp_widget_track_monitor (GTK_WIDGET (scale), gimp_widget_track_monitor (GTK_WIDGET (scale),
G_CALLBACK (gimp_color_scale_destroy_transform), G_CALLBACK (gimp_color_scale_destroy_transform),
NULL); NULL, NULL);
css = gtk_css_provider_new (); css = gtk_css_provider_new ();
gtk_css_provider_load_from_data (css, gtk_css_provider_load_from_data (css,

2
libgimpwidgets/gimppreviewarea.c
View File

@ -162,7 +162,7 @@ gimp_preview_area_init (GimpPreviewArea *area)
gimp_widget_track_monitor (GTK_WIDGET (area), gimp_widget_track_monitor (GTK_WIDGET (area),
G_CALLBACK (gimp_preview_area_destroy_transform), G_CALLBACK (gimp_preview_area_destroy_transform),
NULL); NULL, NULL);
} }
static void static void

14
libgimpwidgets/gimpwidgetsutils.c
View File

@ -434,9 +434,10 @@ track_monitor_hierarchy_changed (GtkWidget *widget,
* Since: 2.10 * Since: 2.10
**/ **/
void void
gimp_widget_track_monitor (GtkWidget *widget, gimp_widget_track_monitor (GtkWidget *widget,
GCallback monitor_changed_callback, GCallback monitor_changed_callback,
gpointer user_data) gpointer user_data,
GDestroyNotify user_data_destroy)
{ {
TrackMonitorData *track_data; TrackMonitorData *track_data;
GtkWidget *toplevel; GtkWidget *toplevel;
@ -450,7 +451,12 @@ gimp_widget_track_monitor (GtkWidget *widget,
track_data->callback = (MonitorChangedCallback) monitor_changed_callback; track_data->callback = (MonitorChangedCallback) monitor_changed_callback;
track_data->user_data = user_data; track_data->user_data = user_data;
g_object_weak_ref (G_OBJECT (widget), (GWeakNotify) g_free, track_data); g_object_weak_ref (G_OBJECT (widget), (GWeakNotify) g_free,
track_data);
if (user_data_destroy)
g_object_weak_ref (G_OBJECT (widget), (GWeakNotify) user_data_destroy,
user_data);
g_signal_connect (widget, "hierarchy-changed", g_signal_connect (widget, "hierarchy-changed",
G_CALLBACK (track_monitor_hierarchy_changed), G_CALLBACK (track_monitor_hierarchy_changed),

3
libgimpwidgets/gimpwidgetsutils.h
View File

@ -47,7 +47,8 @@ GdkMonitor * gimp_get_monitor_at_pointer (void);
void gimp_widget_track_monitor (GtkWidget *widget, void gimp_widget_track_monitor (GtkWidget *widget,
GCallback monitor_changed_callback, GCallback monitor_changed_callback,
gpointer user_data); gpointer user_data,
GDestroyNotify user_data_destroy);
GimpColorProfile * gimp_monitor_get_color_profile (GdkMonitor *monitor); GimpColorProfile * gimp_monitor_get_color_profile (GdkMonitor *monitor);
GimpColorProfile * gimp_widget_get_color_profile (GtkWidget *widget); GimpColorProfile * gimp_widget_get_color_profile (GtkWidget *widget);

2
modules/color-selector-water.c
View File

@ -202,7 +202,7 @@ colorsel_water_init (ColorselWater *water)
gimp_widget_track_monitor (GTK_WIDGET (water), gimp_widget_track_monitor (GTK_WIDGET (water),
G_CALLBACK (colorsel_water_destroy_transform), G_CALLBACK (colorsel_water_destroy_transform),
NULL); NULL, NULL);
} }
static gdouble static gdouble

2
modules/gimpcolorwheel.c
View File

@ -242,7 +242,7 @@ gimp_color_wheel_init (GimpColorWheel *wheel)
gimp_widget_track_monitor (GTK_WIDGET (wheel), gimp_widget_track_monitor (GTK_WIDGET (wheel),
G_CALLBACK (gimp_color_wheel_destroy_transform), G_CALLBACK (gimp_color_wheel_destroy_transform),
NULL); NULL, NULL);
} }
static void static void