From 18cbe3422ea20e535ba56ba302ef49978c5e6ab5 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 4 Oct 2009 19:39:22 +0200 Subject: [PATCH] Add getters for "gimp", "image" and "shell" --- app/display/gimpdisplay.c | 24 +++++++++++++++ app/display/gimpdisplay.h | 61 +++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 28 deletions(-) diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c index 41ae402f96..c32a5aae6c 100644 --- a/app/display/gimpdisplay.c +++ b/app/display/gimpdisplay.c @@ -558,6 +558,22 @@ gimp_display_get_by_ID (Gimp *gimp, return NULL; } +Gimp * +gimp_display_get_gimp (GimpDisplay *display) +{ + g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL); + + return display->gimp; +} + +GimpImage * +gimp_display_get_image (GimpDisplay *display) +{ + g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL); + + return display->image; +} + void gimp_display_set_image (GimpDisplay *display, GimpImage *image) @@ -595,6 +611,14 @@ gimp_display_set_image (GimpDisplay *display, g_object_notify (G_OBJECT (display), "image"); } +GimpDisplayShell * +gimp_display_get_shell (GimpDisplay *display) +{ + g_return_val_if_fail (GIMP_IS_DISPLAY (display), NULL); + + return GIMP_DISPLAY_SHELL (display->shell); +} + void gimp_display_empty (GimpDisplay *display) { diff --git a/app/display/gimpdisplay.h b/app/display/gimpdisplay.h index 9f304056a4..bf64ea0dae 100644 --- a/app/display/gimpdisplay.h +++ b/app/display/gimpdisplay.h @@ -56,40 +56,45 @@ struct _GimpDisplayClass }; -GType gimp_display_get_type (void) G_GNUC_CONST; +GType gimp_display_get_type (void) G_GNUC_CONST; -GimpDisplay * gimp_display_new (Gimp *gimp, - GimpImage *image, - GimpUnit unit, - gdouble scale, - GimpMenuFactory *menu_factory, - GimpUIManager *popup_manager, - GimpDialogFactory *display_factory); -void gimp_display_delete (GimpDisplay *display); -void gimp_display_close (GimpDisplay *display); +GimpDisplay * gimp_display_new (Gimp *gimp, + GimpImage *image, + GimpUnit unit, + gdouble scale, + GimpMenuFactory *menu_factory, + GimpUIManager *popup_manager, + GimpDialogFactory *display_factory); +void gimp_display_delete (GimpDisplay *display); +void gimp_display_close (GimpDisplay *display); -gint gimp_display_get_ID (GimpDisplay *display); -GimpDisplay * gimp_display_get_by_ID (Gimp *gimp, - gint ID); +gint gimp_display_get_ID (GimpDisplay *display); +GimpDisplay * gimp_display_get_by_ID (Gimp *gimp, + gint ID); -void gimp_display_set_image (GimpDisplay *display, - GimpImage *image); +Gimp * gimp_display_get_gimp (GimpDisplay *display); -void gimp_display_empty (GimpDisplay *display); -void gimp_display_fill (GimpDisplay *display, - GimpImage *image, - GimpUnit unit, - gdouble scale); +GimpImage * gimp_display_get_image (GimpDisplay *display); +void gimp_display_set_image (GimpDisplay *display, + GimpImage *image); -void gimp_display_update_area (GimpDisplay *display, - gboolean now, - gint x, - gint y, - gint w, - gint h); +GimpDisplayShell * gimp_display_get_shell (GimpDisplay *display); -void gimp_display_flush (GimpDisplay *display); -void gimp_display_flush_now (GimpDisplay *display); +void gimp_display_empty (GimpDisplay *display); +void gimp_display_fill (GimpDisplay *display, + GimpImage *image, + GimpUnit unit, + gdouble scale); + +void gimp_display_update_area (GimpDisplay *display, + gboolean now, + gint x, + gint y, + gint w, + gint h); + +void gimp_display_flush (GimpDisplay *display); +void gimp_display_flush_now (GimpDisplay *display); #endif /* __GIMP_DISPLAY_H__ */