From 92aff599b55a88a7ef0c648567f59c0846d4a91c Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Sun, 7 Jul 2002 03:16:35 +0000
Subject: [PATCH] Update Layout more correctly in DoSetVirtualSize. fixed
 format string typo.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/scrolwin.cpp  | 10 +++++-----
 src/gtk1/scrolwin.cpp | 10 +++++-----
 src/msw/nativdlg.cpp  |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index 4e89b7d390..222c399fc3 100644
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif
 }
 
 /*
@@ -816,11 +821,6 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
         m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
 
     SetVirtualSize( GetClientSize() );
-
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
 }
 
 // This calls OnDraw, having adjusted the origin according to the current
diff --git a/src/gtk1/scrolwin.cpp b/src/gtk1/scrolwin.cpp
index 4e89b7d390..222c399fc3 100644
--- a/src/gtk1/scrolwin.cpp
+++ b/src/gtk1/scrolwin.cpp
@@ -325,6 +325,11 @@ void wxScrolledWindow::DoSetVirtualSize( int x, int y )
 {
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
+
+#if wxUSE_CONSTRAINTS
+    if (GetAutoLayout())
+        Layout();
+#endif
 }
 
 /*
@@ -816,11 +821,6 @@ void wxScrolledWindow::OnSize(wxSizeEvent& WXUNUSED(event))
         m_targetWindow->SetVirtualSize( m_targetWindow->GetClientSize() );
 
     SetVirtualSize( GetClientSize() );
-
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
 }
 
 // This calls OnDraw, having adjusted the origin according to the current
diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index 85a7920b99..eac7d80f51 100644
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -211,7 +211,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         }
         else
         {
-            wxLogError(wxT("Don't know what kind of button this is: id = %d"),
+            wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
                        id);
         }
     }
-- 
2.45.2