[gimp] Finally fully enable the image window's active_display mechanism
- From: Michael Natterer <mitch src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gimp] Finally fully enable the image window's active_display mechanism
- Date: Tue, 29 Sep 2009 18:38:45 +0000 (UTC)
commit d2f43f1604bb96f2421732da177b7ed7b59a9166
Author: Michael Natterer <mitch gimp org>
Date: Fri Sep 25 12:13:05 2009 +0200
Finally fully enable the image window's active_display mechanism
Don't set the window's active_display manually in gimp_display_shell_new(),
setting it properly after construction in gimp_display_new() works fine
now. Enable all disabled code in gimp_image_window_set_active_display().
app/display/gimpdisplayshell.c | 3 ---
app/display/gimpimagewindow.c | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index ad9dbc1..61164f8 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -846,9 +846,6 @@ gimp_display_shell_new (GimpDisplay *display,
shell->display = display;
- /* FIXME image window */
- GIMP_IMAGE_WINDOW (shell)->active_display = display;
-
shell->popup_manager = popup_manager;
if (display->image)
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 5ace858..804cd7b 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -396,8 +396,6 @@ gimp_image_window_set_active_display (GimpImageWindow *window,
g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
g_return_if_fail (GIMP_IS_DISPLAY (display));
-#if 0
- /* FIXME enable this when the display is a separate widget */
if (display == window->active_display)
return;
@@ -424,7 +422,6 @@ gimp_image_window_set_active_display (GimpImageWindow *window,
}
window->active_display = display;
-#endif
g_signal_connect (window->active_display, "notify::image",
G_CALLBACK (gimp_image_window_image_notify),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]