GNOME.org
 

[gimp] Use gtk_widget_get_window() instead of widget->window

commit 4da5ed3a8b86142967168f0f337c833f159eb3b6
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jul 15 15:02:31 2009 +0200

    Use gtk_widget_get_window() instead of widget->window

 app/display/gimpdisplay-foreach.c           |    3 ++-
 app/display/gimpdisplayshell-cursor.c       |    2 +-
 app/display/gimpdisplayshell-draw.c         |    8 ++++----
 app/display/gimpdisplayshell-layer-select.c |    2 +-
 app/display/gimpdisplayshell-preview.c      |    8 ++++----
 app/display/gimpdisplayshell-progress.c     |   12 ++++++++----
 app/display/gimpdisplayshell-title.c        |    6 ++++--
 app/display/gimpnavigationeditor.c          |    3 ++-
 app/display/gimpstatusbar.c                 |   11 ++++++-----
 9 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/app/display/gimpdisplay-foreach.c b/app/display/gimpdisplay-foreach.c
index 549dd3c..1abbec4 100644
--- a/app/display/gimpdisplay-foreach.c
+++ b/app/display/gimpdisplay-foreach.c
@@ -246,7 +246,8 @@ gimp_displays_get_num_visible (Gimp *gimp)
 
       if (GTK_WIDGET_DRAWABLE (display->shell))
         {
-          GdkWindowState state = gdk_window_get_state (display->shell->window);
+          GdkWindow      *window = gtk_widget_get_window (display->shell);
+          GdkWindowState  state  = gdk_window_get_state (window);
 
           if ((state & (GDK_WINDOW_STATE_WITHDRAWN |
                         GDK_WINDOW_STATE_ICONIFIED)) == 0)
diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c
index 9cf94a5..9aa7acb 100644
--- a/app/display/gimpdisplayshell-cursor.c
+++ b/app/display/gimpdisplayshell-cursor.c
@@ -231,7 +231,7 @@ gimp_display_shell_real_set_cursor (GimpDisplayShell   *shell,
       shell->current_cursor = cursor_type;
 
       if (GTK_WIDGET_DRAWABLE (shell->canvas))
-        gdk_window_set_cursor (shell->canvas->window, NULL);
+        gdk_window_set_cursor (gtk_widget_get_window (shell->canvas), NULL);
 
       return;
     }
diff --git a/app/display/gimpdisplayshell-draw.c b/app/display/gimpdisplayshell-draw.c
index 1481495..5c95aa0 100644
--- a/app/display/gimpdisplayshell-draw.c
+++ b/app/display/gimpdisplayshell-draw.c
@@ -146,7 +146,7 @@ gimp_display_shell_draw_guide (const GimpDisplayShell *shell,
   x1 = 0;
   y1 = 0;
 
-  gdk_drawable_get_size (shell->canvas->window, &x2, &y2);
+  gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &x2, &y2);
 
   switch (gimp_guide_get_orientation (guide))
     {
@@ -429,7 +429,7 @@ gimp_display_shell_draw_sample_point (const GimpDisplayShell *shell,
   y1 = floor (y - GIMP_SAMPLE_POINT_DRAW_SIZE);
   y2 = ceil  (y + GIMP_SAMPLE_POINT_DRAW_SIZE);
 
-  gdk_drawable_get_size (shell->canvas->window, &w, &h);
+  gdk_drawable_get_size (gtk_widget_get_window (shell->canvas), &w, &h);
 
   if (x < - GIMP_SAMPLE_POINT_DRAW_SIZE   ||
       y < - GIMP_SAMPLE_POINT_DRAW_SIZE   ||
@@ -663,7 +663,7 @@ gimp_display_shell_get_grid_gc (GimpDisplayShell *shell,
 
   values.join_style = GDK_JOIN_MITER;
 
-  shell->grid_gc = gdk_gc_new_with_values (shell->canvas->window,
+  shell->grid_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas),
                                            &values, (GDK_GC_LINE_STYLE |
                                                      GDK_GC_JOIN_STYLE));
 
@@ -692,7 +692,7 @@ gimp_display_shell_get_pen_gc (GimpDisplayShell *shell,
   values.cap_style  = GDK_CAP_ROUND;
   values.join_style = GDK_JOIN_ROUND;
 
-  shell->pen_gc = gdk_gc_new_with_values (shell->canvas->window,
+  shell->pen_gc = gdk_gc_new_with_values (gtk_widget_get_window (shell->canvas),
                                           &values, (GDK_GC_LINE_STYLE |
                                                     GDK_GC_CAP_STYLE  |
                                                     GDK_GC_JOIN_STYLE));
diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c
index e6ec0e0..faeae5d 100644
--- a/app/display/gimpdisplayshell-layer-select.c
+++ b/app/display/gimpdisplayshell-layer-select.c
@@ -93,7 +93,7 @@ gimp_display_shell_layer_select_init (GimpDisplayShell *shell,
 
   gtk_widget_show (layer_select->shell);
 
-  gdk_keyboard_grab (layer_select->shell->window, FALSE, time);
+  gdk_keyboard_grab (gtk_widget_get_window (layer_select->shell), FALSE, time);
 }
 
 
diff --git a/app/display/gimpdisplayshell-preview.c b/app/display/gimpdisplayshell-preview.c
index 2c7aaf5..68163de 100644
--- a/app/display/gimpdisplayshell-preview.c
+++ b/app/display/gimpdisplayshell-preview.c
@@ -318,10 +318,10 @@ gimp_display_shell_preview_transform (GimpDisplayShell *shell)
   k = columns * rows;
   for (j = 0; j < k; j++)
     gimp_display_shell_draw_quad (tool->drawable,
-                    GDK_DRAWABLE (GTK_WIDGET (shell->canvas)->window),
-                    mask, mask_offx, mask_offy,
-                    x[j], y[j], u[j], v[j],
-                    opacity);
+                                  GDK_DRAWABLE (gtk_widget_get_window (shell->canvas)),
+                                  mask, mask_offx, mask_offy,
+                                  x[j], y[j], u[j], v[j],
+                                  opacity);
 }
 
 
diff --git a/app/display/gimpdisplayshell-progress.c b/app/display/gimpdisplayshell-progress.c
index 62b1fce..8b311fd 100644
--- a/app/display/gimpdisplayshell-progress.c
+++ b/app/display/gimpdisplayshell-progress.c
@@ -51,7 +51,8 @@ gimp_display_shell_progress_start (GimpProgress *progress,
 
   if (progress && gimp_display_shell_is_iconified (shell))
     {
-      gdk_window_set_title (GTK_WIDGET (shell)->window, message);
+      gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)),
+                            message);
     }
 
   return progress;
@@ -87,7 +88,8 @@ gimp_display_shell_progress_set_text (GimpProgress *progress,
   if (gimp_progress_is_active (GIMP_PROGRESS (shell->statusbar)) &&
       gimp_display_shell_is_iconified (shell))
     {
-      gdk_window_set_title (GTK_WIDGET (shell)->window, message);
+      gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)),
+                            message);
     }
 }
 
@@ -165,7 +167,8 @@ gimp_display_shell_is_iconified (GimpDisplayShell *shell)
   GtkWidget *widget = GTK_WIDGET (shell);
 
   return (GTK_WIDGET_DRAWABLE (widget) &&
-          gdk_window_get_state (widget->window) == GDK_WINDOW_STATE_ICONIFIED);
+          gdk_window_get_state (gtk_widget_get_window (widget)) ==
+          GDK_WINDOW_STATE_ICONIFIED);
 }
 
 
@@ -195,7 +198,8 @@ gimp_display_shell_progress_window_state_changed (GimpDisplayShell *shell)
                                               "progress");
       if (msg)
         {
-          gdk_window_set_title (GTK_WIDGET (shell)->window, msg);
+          gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)),
+                                msg);
           return;
         }
     }
diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c
index ec6d353..eabf786 100644
--- a/app/display/gimpdisplayshell-title.c
+++ b/app/display/gimpdisplayshell-title.c
@@ -107,7 +107,8 @@ gimp_display_shell_update_title_idle (gpointer data)
 
       g_strlcpy (title + len, GIMP_ACRONYM, sizeof (title) - len);
 
-      gdk_window_set_title (GTK_WIDGET (shell)->window, title);
+      gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)),
+                            title);
 
       /* format the statusbar */
       gimp_display_shell_format_title (shell, title, sizeof (title),
@@ -118,7 +119,8 @@ gimp_display_shell_update_title_idle (gpointer data)
     }
   else
     {
-      gdk_window_set_title (GTK_WIDGET (shell)->window, GIMP_NAME);
+      gdk_window_set_title (gtk_widget_get_window (GTK_WIDGET (shell)),
+                            GIMP_NAME);
 
       gimp_statusbar_replace (GIMP_STATUSBAR (shell->statusbar), "title",
                               NULL, " ");
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
index fa6eb71..af5966d 100644
--- a/app/display/gimpnavigationeditor.c
+++ b/app/display/gimpnavigationeditor.c
@@ -277,7 +277,8 @@ gimp_navigation_editor_popup (GimpDisplayShell *shell,
     gint border_width, border_height;
     gint screen_click_x, screen_click_y;
 
-    gdk_window_get_origin (widget->window, &x_origin, &y_origin);
+    gdk_window_get_origin (gtk_widget_get_window (widget),
+                           &x_origin, &y_origin);
 
     screen_click_x = x_origin + click_x;
     screen_click_y = y_origin + click_y;
diff --git a/app/display/gimpstatusbar.c b/app/display/gimpstatusbar.c
index 42d55b9..7c860f3 100644
--- a/app/display/gimpstatusbar.c
+++ b/app/display/gimpstatusbar.c
@@ -368,7 +368,7 @@ gimp_statusbar_progress_start (GimpProgress *progress,
         }
 
       if (GTK_WIDGET_DRAWABLE (bar))
-        gdk_window_process_updates (bar->window, TRUE);
+        gdk_window_process_updates (gtk_widget_get_window (bar), TRUE);
 
       return progress;
     }
@@ -426,7 +426,7 @@ gimp_statusbar_progress_set_text (GimpProgress *progress,
       gimp_statusbar_replace (statusbar, "progress", NULL, "%s", message);
 
       if (GTK_WIDGET_DRAWABLE (bar))
-        gdk_window_process_updates (bar->window, TRUE);
+        gdk_window_process_updates (gtk_widget_get_window (bar), TRUE);
     }
 }
 
@@ -450,7 +450,7 @@ gimp_statusbar_progress_set_value (GimpProgress *progress,
           gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), percentage);
 
           if (GTK_WIDGET_DRAWABLE (bar))
-            gdk_window_process_updates (bar->window, TRUE);
+            gdk_window_process_updates (gtk_widget_get_window (bar), TRUE);
         }
     }
 }
@@ -480,7 +480,7 @@ gimp_statusbar_progress_pulse (GimpProgress *progress)
       gtk_progress_bar_pulse (GTK_PROGRESS_BAR (bar));
 
       if (GTK_WIDGET_DRAWABLE (bar))
-        gdk_window_process_updates (bar->window, TRUE);
+        gdk_window_process_updates (gtk_widget_get_window (bar), TRUE);
     }
 }
 
@@ -1269,7 +1269,8 @@ gimp_statusbar_label_expose (GtkWidget      *widget,
                                     PANGO_PIXELS (rect.width) : 0);
       y += PANGO_PIXELS (rect.y);
 
-      gdk_draw_pixbuf (widget->window, gtk_widget_get_style (widget)->black_gc,
+      gdk_draw_pixbuf (gtk_widget_get_window (widget),
+                       gtk_widget_get_style (widget)->black_gc,
                        statusbar->icon,
                        0, 0,
                        x, y,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]