Fixed bug [ 754596 ] wxUSE_CONSTRAINTS 0 breaks AutoLayout() with sizers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/deprecated/tbarsmpl.cpp b/contrib/src/deprecated/tbarsmpl.cpp
index 4bac4dfeb531c88051724321be63386d31a2fb0b..b33814360c69e330f96520f7e25ca197ef8b7bc2 100644 (file)
--- a/contrib/src/deprecated/tbarsmpl.cpp
+++ b/contrib/src/deprecated/tbarsmpl.cpp
@@ -398,10 +398,8 @@ void wxToolBarSimple::OnPaint (wxPaintEvent& WXUNUSED(event))
 
 void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
 {
 
 void wxToolBarSimple::OnSize (wxSizeEvent& WXUNUSED(event))
 {

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif

 
     AdjustScrollbars();
 }
 
     AdjustScrollbars();
 }

diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index aae2a32368aa7672762c0e93677a14ed160b559e..ab3ad11848b2109705e0b67a7097562289bf2add 100644 (file)
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -151,9 +151,9 @@ void wxPanel::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 void wxPanel::OnSize(wxSizeEvent& event)
 {
 
 void wxPanel::OnSize(wxSizeEvent& event)
 {

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

+#if wxUSE_CONSTRAINTS

 #if defined(__WXPM__)
     else
     {
 #if defined(__WXPM__)
     else
     {

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 03165ffd11b2f1055bef7ec4edf99c872d44d07b..deea726fb60226b6919e86b0dd9274b56939e680 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -1243,10 +1243,8 @@ void wxGenericScrolledWindow::DoSetVirtualSize(int x, int y)
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 
     wxPanel::DoSetVirtualSize( x, y );
     AdjustScrollbars();
 

-#if wxUSE_CONSTRAINTS

     if (GetAutoLayout())
         Layout();
     if (GetAutoLayout())
         Layout();

-#endif

 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)
 }
 
 void wxGenericScrolledWindow::OnPaint(wxPaintEvent& event)