Remove a couple of places if (widget->window), this function will only

Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_move_resize): Remove
        a couple of places if (widget->window), this function
        will only ever be called on a realized window.
        (#80225)

diff --git a/ChangeLog b/ChangeLog
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ec07ed52be1fbaa87995422eceb541cdc38ed595..6ca3cbfc022f7398e53f859f26ceda3797706923 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Mon Dec  9 19:49:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_move_resize): Remove
+       a couple of places if (widget->window), this function
+       will only ever be called on a realized window.
+       (#80225)
+
 Tue Dec 10 01:58:43 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreeview.c (validate_visible_area): implement a working

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 13e7a0da3d9639b6df2e04a74efc1aa25852b0ff..f5d13a314d137838a1bd747f2ccfefac38477c5b 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5067,10 +5067,9 @@ gtk_window_move_resize (GtkWindow *window)
                                  new_request.width, new_request.height);
            }
          else
-           if (widget->window)
-             gdk_window_move_resize (widget->window,
-                                     new_request.x, new_request.y,
-                                     new_request.width, new_request.height);
+           gdk_window_move_resize (widget->window,
+                                   new_request.x, new_request.y,
+                                   new_request.width, new_request.height);
        }
       else  /* only size changed */
        {
@@ -5078,9 +5077,8 @@ gtk_window_move_resize (GtkWindow *window)
            gdk_window_resize (window->frame,
                               new_request.width + window->frame_left + window->frame_right,
                               new_request.height + window->frame_top + window->frame_bottom);
-         if (widget->window)
-           gdk_window_resize (widget->window,
-                              new_request.width, new_request.height);
+         gdk_window_resize (widget->window,
+                            new_request.width, new_request.height);
        }
       
       /* Increment the number of have-not-yet-received-notify requests */