diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index 0f0c5ece7a..96f4ef857c 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -1764,7 +1764,6 @@ void wxPreviewFrame::InitializeWithModality(wxPreviewFrameModalityKind kind)
     sizer->Add( m_controlBar, wxSizerFlags().Expand().Border() );
     sizer->Add( m_previewCanvas, wxSizerFlags(1).Expand().Border() );
 
-    SetAutoLayout( true );
     SetSizer( sizer );
 
     m_modalityKind = kind;
diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp
index 2222b7afbe..e6b2579781 100644
--- a/src/generic/colrdlgg.cpp
+++ b/src/generic/colrdlgg.cpp
@@ -392,7 +392,6 @@ void wxGenericColourDialog::CreateWidgets()
         topSizer->Add(buttonsizer, wxSizerFlags().Expand().DoubleBorder());
     }
 
-    SetAutoLayout( true );
     SetSizer( topSizer );
 
     topSizer->SetSizeHints( this );
diff --git a/src/generic/dirdlgg.cpp b/src/generic/dirdlgg.cpp
index fd5565033a..cc4585f7b5 100644
--- a/src/generic/dirdlgg.cpp
+++ b/src/generic/dirdlgg.cpp
@@ -157,7 +157,6 @@ bool wxGenericDirDialog::Create(wxWindow* parent,
 
     m_input->SetFocus();
 
-    SetAutoLayout( true );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
diff --git a/src/generic/fdrepdlg.cpp b/src/generic/fdrepdlg.cpp
index c2c169cb8a..d210f71c11 100644
--- a/src/generic/fdrepdlg.cpp
+++ b/src/generic/fdrepdlg.cpp
@@ -204,7 +204,6 @@ bool wxGenericFindReplaceDialog::Create(wxWindow *parent,
     if ( style & wxFR_NOUPDOWN)
         m_radioDir->Enable(false);
 
-    SetAutoLayout( true );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
diff --git a/src/generic/filectrlg.cpp b/src/generic/filectrlg.cpp
index d1e49502db..f914e42c26 100644
--- a/src/generic/filectrlg.cpp
+++ b/src/generic/filectrlg.cpp
@@ -985,7 +985,6 @@ bool wxGenericFileCtrl::Create( wxWindow *parent,
 
     SetWildcard( wildCard );
 
-    SetAutoLayout( true );
     SetSizer( mainsizer );
 
     if ( !is_pda )
diff --git a/src/generic/fontdlgg.cpp b/src/generic/fontdlgg.cpp
index 6b0ac77bdc..80ac67ea4d 100644
--- a/src/generic/fontdlgg.cpp
+++ b/src/generic/fontdlgg.cpp
@@ -354,7 +354,6 @@ void wxGenericFontDialog::CreateWidgets()
 
     wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL);
     this->SetSizer(itemBoxSizer2);
-    this->SetAutoLayout(true);
 
     wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL);
     itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5);
diff --git a/src/generic/msgdlgg.cpp b/src/generic/msgdlgg.cpp
index b379503cef..0eab99dc2a 100644
--- a/src/generic/msgdlgg.cpp
+++ b/src/generic/msgdlgg.cpp
@@ -217,7 +217,6 @@ void wxGenericMessageDialog::DoCreateMsgdialog()
     if ( sizerBtn )
         topsizer->Add(sizerBtn, 0, wxEXPAND | wxALL, 10 );
 
-    SetAutoLayout( true );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
diff --git a/src/generic/numdlgg.cpp b/src/generic/numdlgg.cpp
index 1096231e69..da35c8cdb1 100644
--- a/src/generic/numdlgg.cpp
+++ b/src/generic/numdlgg.cpp
@@ -120,7 +120,6 @@ bool wxNumberEntryDialog::Create(wxWindow *parent,
     }
 
     SetSizer( topsizer );
-    SetAutoLayout( true );
 
     topsizer->SetSizeHints( this );
     topsizer->Fit( this );
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 86d748e43d..ad1612e3bc 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -249,7 +249,6 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     if ( sizerBtn )
         mainsizer->Add(sizerBtn, 0, wxEXPAND|wxALL, 10 );
 
-    SetAutoLayout( true );
     SetSizer( mainsizer );
 
     mainsizer->Fit( this );
@@ -659,7 +658,6 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 
     main_sizer->Add( CreateButtonSizer( wxOK|wxCANCEL), 0, wxEXPAND|wxALL, 10 );
 
-    SetAutoLayout( true );
     SetSizer( main_sizer );
 
     main_sizer->Fit( this );
@@ -921,7 +919,6 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
     mainsizer->Add( buttonsizer, 0, wxEXPAND|wxALL, 10 );
 
 
-    SetAutoLayout( true );
     SetSizer( mainsizer );
 
     mainsizer->Fit( this );
diff --git a/src/generic/textdlgg.cpp b/src/generic/textdlgg.cpp
index 9cae084bf1..d199aca3e4 100644
--- a/src/generic/textdlgg.cpp
+++ b/src/generic/textdlgg.cpp
@@ -115,7 +115,6 @@ bool wxTextEntryDialog::Create(wxWindow *parent,
         topsizer->Add(buttonSizer, wxSizerFlags(flagsBorder2).Expand());
     }
 
-    SetAutoLayout( true );
     SetSizer( topsizer );
 
     topsizer->SetSizeHints( this );
diff --git a/src/html/helpdlg.cpp b/src/html/helpdlg.cpp
index 359354f41e..ff5bf8471e 100644
--- a/src/html/helpdlg.cpp
+++ b/src/html/helpdlg.cpp
@@ -74,7 +74,6 @@ bool wxHtmlHelpDialog::Create(wxWindow* parent, wxWindowID id,
     wxWindow* item1 = this;
     wxBoxSizer* item2 = new wxBoxSizer(wxVERTICAL);
     item1->SetSizer(item2);
-    item1->SetAutoLayout(true);
 
     wxWindow* item3 = m_HtmlHelpWin;
     item2->Add(item3, 1, wxGROW|wxALL, 5);
diff --git a/src/html/helpwnd.cpp b/src/html/helpwnd.cpp
index 2a21497c37..f302f38023 100644
--- a/src/html/helpwnd.cpp
+++ b/src/html/helpwnd.cpp
@@ -326,7 +326,6 @@ bool wxHtmlHelpWindow::Create(wxWindow* parent, wxWindowID id,
     // The sizer for the whole top-level window.
     wxSizer *topWindowSizer = new wxBoxSizer(wxVERTICAL);
     SetSizer(topWindowSizer);
-    SetAutoLayout(true);
 
 #if wxUSE_TOOLBAR
     // toolbar?