remove/replace redundant SetAutoLayout() and Fit() calls, leave just SetSizer[AndFit...

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

diff --git a/samples/artprov/artbrows.cpp b/samples/artprov/artbrows.cpp
index f4b8eb666f10102cafa1f1baaa3f4e520516b621..599c36c9c362183939835a5475d704af9b6a1e1c 100644 (file)
--- a/samples/artprov/artbrows.cpp
+++ b/samples/artprov/artbrows.cpp
@@ -162,8 +162,7 @@ wxArtBrowserDialog::wxArtBrowserDialog(wxWindow *parent)
     ok->SetDefault();
     sizer->Add(ok, 0, wxALIGN_RIGHT | wxALL, 10);
 
     ok->SetDefault();
     sizer->Add(ok, 0, wxALIGN_RIGHT | wxALL, 10);
 

-    SetSizer(sizer);
-    sizer->Fit(this);
+    SetSizerAndFit(sizer);

 
     choice->SetSelection(6/*wxART_MESSAGE_BOX*/);
     SetArtClient(wxART_MESSAGE_BOX);
 
     choice->SetSelection(6/*wxART_MESSAGE_BOX*/);
     SetArtClient(wxART_MESSAGE_BOX);

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 236468c6cb09202e910cfd122ceb62dce4f60f9f..0b9b11546dc7e46dddf51e40c0e2ac8a27084a34 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -1015,7 +1015,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     // sizer
     panel = new wxPanel(m_book);
 
     // sizer
     panel = new wxPanel(m_book);

-    panel->SetAutoLayout( true );

 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 
 
     wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
 

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 683cb0375e4c7d05e565f0cbc8db964364f0f8ef..456f75f97ef74f969b8610577f5f4615f22a3547 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -313,7 +313,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add(m_book, 1, wxEXPAND);
     panel->SetSizer(sizer);
     wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add(m_book, 1, wxEXPAND);
     panel->SetSizer(sizer);

-    sizer->Fit(this);

     sizer->SetSizeHints(this);
 }
 
     sizer->SetSizeHints(this);
 }
 

diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp
index f7af7468febe68e13c5c417b2d9415705793f80d..307c07d4ddad19f081be067b5f5fbbd2e5164ec2 100644 (file)
--- a/samples/dnd/dnd.cpp
+++ b/samples/dnd/dnd.cpp
@@ -1624,8 +1624,7 @@ DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
     buttonSizer->Add( bt, 0, wxALL, 2 );
     topSizer->Add( buttonSizer, 0, wxALL|wxALIGN_RIGHT, 2 );
 
     buttonSizer->Add( bt, 0, wxALL, 2 );
     topSizer->Add( buttonSizer, 0, wxALL|wxALIGN_RIGHT, 2 );
 

-    SetSizer( topSizer );
-    topSizer->Fit( this );
+    SetSizerAndFit( topSizer );

 }
 
 DnDShape *DnDShapeDialog::GetShape() const
 }
 
 DnDShape *DnDShapeDialog::GetShape() const

diff --git a/samples/editlbox/editlbox.cpp b/samples/editlbox/editlbox.cpp
index 66a91d19fe970fbaf776d3378ef79c4ad6d6d487..a317e4edeb1636686b69c5fe543e619124c6b2da 100644 (file)
--- a/samples/editlbox/editlbox.cpp
+++ b/samples/editlbox/editlbox.cpp
@@ -48,8 +48,7 @@ bool MyApp::OnInit()
     sizer->Add(5,5);
 
     sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);
     sizer->Add(5,5);
 
     sizer->Add(new wxButton(&dlg, wxID_OK, _("OK")), 0, wxALIGN_RIGHT | wxALL, 10);

-    dlg.SetSizer(sizer);
-    sizer->Fit(&dlg);
+    dlg.SetSizerAndFit(sizer);

     dlg.Centre();
 
     dlg.ShowModal();
     dlg.Centre();
 
     dlg.ShowModal();

diff --git a/samples/except/except.cpp b/samples/except/except.cpp
index f401d6ce186e7675ac98ddbb51cc5e555601aea6..5e487845d55ecac6530c86c686a9ff9f26b52621 100644 (file)
--- a/samples/except/except.cpp
+++ b/samples/except/except.cpp
@@ -475,8 +475,7 @@ MyDialog::MyDialog(wxFrame *parent)
     sizerTop->Add(new wxButton(this, wxID_CANCEL, _T("&Cancel")),
                   0, wxCENTRE | wxALL, 5);
 
     sizerTop->Add(new wxButton(this, wxID_CANCEL, _T("&Cancel")),
                   0, wxCENTRE | wxALL, 5);
 

-    SetSizer(sizerTop);
-    sizerTop->Fit(this);
+    SetSizerAndFit(sizerTop);

 }
 
 void MyDialog::OnThrowInt(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyDialog::OnThrowInt(wxCommandEvent& WXUNUSED(event))

diff --git a/samples/grid/griddemo.cpp b/samples/grid/griddemo.cpp
index a3c6b4287c04002f9cc2587a60198db0b90e07a0..363fa804726154a6e31e0d0cb2669864096f9bb1 100644 (file)
--- a/samples/grid/griddemo.cpp
+++ b/samples/grid/griddemo.cpp
@@ -371,10 +371,7 @@ GridFrame::GridFrame()
                    wxEXPAND );
 #endif // wxUSE_LOG
 
                    wxEXPAND );
 #endif // wxUSE_LOG
 

-    SetAutoLayout(true);
-    SetSizer( topSizer );
-
-    topSizer->Fit( this );
+    SetSizerAndFit( topSizer );

 
     Centre();
     SetDefaults();
 
     Centre();
     SetDefaults();

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 7749c96fc8b9831d82d4a0e5478825b607b8720c..74574c239f24b988b9db6d5b3a3d920d90183219 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -711,10 +711,7 @@ MyModalDialog::MyModalDialog(wxWindow *parent)
     sizerTop->Add(text, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     sizerTop->Add(sizerRow, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     sizerTop->Add(text, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
     sizerTop->Add(sizerRow, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 

-    SetSizer(sizerTop);
-
-    sizerTop->SetSizeHints(this);
-    sizerTop->Fit(this);
+    SetSizerAndFit(sizerTop);

 
     btnOK->SetFocus();
     btnOK->SetDefault();
 
     btnOK->SetFocus();
     btnOK->SetDefault();

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 110b6ef213b1b15ebae57af901f16aa1831b34d7..da5a8580b5d3033fd162837926ae0b087b9e147f 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -426,12 +426,10 @@ MySizerDialog::MySizerDialog(wxWindow *parent, const wxString &title)
     wxButton *button2 = new wxButton( panel, wxID_ANY, _T("Hallo") );
     panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
 
     wxButton *button2 = new wxButton( panel, wxID_ANY, _T("Hallo") );
     panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 );
 

-    panel->SetAutoLayout( true );

     panel->SetSizer( panelsizer );
 
     // Tell dialog to use sizer
     panel->SetSizer( panelsizer );
 
     // Tell dialog to use sizer

-    SetSizer( topsizer );
-    topsizer->SetSizeHints( this );
+    SetSizerAndFit( topsizer );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -662,11 +660,7 @@ MyNestedSizerFrame::MyNestedSizerFrame(const wxString &title, int x, int y )
     m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) );
     main_sizer->Add( m_target, 1, wxALL|wxGROW, 5 );
 
     m_target = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80, wxDefaultCoord ) );
     main_sizer->Add( m_target, 1, wxALL|wxGROW, 5 );
 

-    SetSizer( main_sizer);
-
-    Layout();
-    GetSizer()->Fit( this );
-    GetSizer()->SetSizeHints( this );
+    SetSizerAndFit( main_sizer);

 }
 
 
 }
 
 


@@ -708,8 +702,6 @@ MyWrapSizerFrame::MyWrapSizerFrame(const wxString &title, int x, int y )
     root->Add( ps_bottom, 1, wxEXPAND | wxALL, 5 );
         
     // Set sizer for window
     root->Add( ps_bottom, 1, wxEXPAND | wxALL, 5 );
         
     // Set sizer for window

-    SetSizer( root );
-    root->Fit( this );
-    root->SetSizeHints( this );
+    SetSizerAndFit( root );

 }
 
 }
 

diff --git a/samples/mediaplayer/mediaplayer.cpp b/samples/mediaplayer/mediaplayer.cpp
index aeba330fc55c2be2cf8ff862c0e51975d344a215..e1f0961a4ce32c0540f3c9febcab9d1c27eda783 100644 (file)
--- a/samples/mediaplayer/mediaplayer.cpp
+++ b/samples/mediaplayer/mediaplayer.cpp
@@ -1534,7 +1534,6 @@ wxMediaPlayerNotebookPage::wxMediaPlayerNotebookPage(wxMediaPlayerFrame* parentF
     //
     wxFlexGridSizer* sizer = new wxFlexGridSizer(2, 1, 0, 0);
     this->SetSizer(sizer);
     //
     wxFlexGridSizer* sizer = new wxFlexGridSizer(2, 1, 0, 0);
     this->SetSizer(sizer);

-    this->SetAutoLayout(true);

     sizer->AddGrowableRow(0);
     sizer->AddGrowableCol(0);
 
     sizer->AddGrowableRow(0);
     sizer->AddGrowableCol(0);
 

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 62dcd75b0acdee8272d7d14d3fd6c0e03eaff936..14f3fd951c3e98293b16a2811def5c8cdd719b0a 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -332,7 +332,6 @@ MyFrame::MyFrame()
 
     m_panel->SetSizer(m_sizerFrame);
 
 
     m_panel->SetSizer(m_sizerFrame);
 

-    m_sizerFrame->Fit(this);

     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);
     m_sizerFrame->SetSizeHints(this);
 
     Centre(wxBOTH);

diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 6ea7c912db9c41061eb51e8d30c1cb057e2aaa03..8a3bcf268ce2d2cfa157039a4d1ea30e135780ed 100644 (file)
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -142,7 +142,6 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent )
     topSizer->Add( m_spinCtrl, 0, wxALL, 5 );
     topSizer->Add( m_mouseText, 0, wxCENTRE|wxALL, 5 );
 
     topSizer->Add( m_spinCtrl, 0, wxALL, 5 );
     topSizer->Add( m_mouseText, 0, wxCENTRE|wxALL, 5 );
 

-    m_panel->SetAutoLayout( true );

     m_panel->SetSizer( topSizer );
     topSizer->Fit(m_panel);
     topSizer->Fit(this);
     m_panel->SetSizer( topSizer );
     topSizer->Fit(m_panel);
     topSizer->Fit(this);


@@ -365,7 +364,6 @@ MyFrame::MyFrame(const wxString& title)
     topSizer->Add( button2, 0, wxALL, 5 );
     topSizer->Add( m_logWin, 1, wxEXPAND|wxALL, 5 );
 
     topSizer->Add( button2, 0, wxALL, 5 );
     topSizer->Add( m_logWin, 1, wxEXPAND|wxALL, 5 );
 

-    panel->SetAutoLayout( true );

     panel->SetSizer( topSizer );
 
 }
     panel->SetSizer( topSizer );
 
 }


@@ -452,9 +450,7 @@ MyDialog::MyDialog(const wxString& title)
     topSizer->AddSpacer(40);
     topSizer->Add( okButton, 0, wxALL, 5 );
 
     topSizer->AddSpacer(40);
     topSizer->Add( okButton, 0, wxALL, 5 );
 

-    panel->SetAutoLayout( true );
-    panel->SetSizer( topSizer );
-    topSizer->Fit(this);
+    panel->SetSizerAndFit( topSizer );

 }
 
 void MyDialog::OnStartSimplePopup(wxCommandEvent& event)
 }
 
 void MyDialog::OnStartSimplePopup(wxCommandEvent& event)

diff --git a/samples/scrollsub/scrollsub.cpp b/samples/scrollsub/scrollsub.cpp
index e26edd550f332484596c92b49f4ea5add9b12e16..0799ec5aa6a9199986300d2dbcad249fd8b028aa 100644 (file)
--- a/samples/scrollsub/scrollsub.cpp
+++ b/samples/scrollsub/scrollsub.cpp
@@ -174,7 +174,6 @@ MyScrolledWindow::MyScrolledWindow( wxWindow *parent, wxWindowID id,
 
     mainsizer->Add( middlesizer, 1, wxEXPAND );
 
 
     mainsizer->Add( middlesizer, 1, wxEXPAND );
 

-    SetAutoLayout( true );

     SetSizer( mainsizer );
 }
 
     SetSizer( mainsizer );
 }
 


@@ -421,7 +420,6 @@ MyFrame::MyFrame()
     topsizer->Add( m_log, 0, wxEXPAND );
 #endif // wxUSE_LOG
 
     topsizer->Add( m_log, 0, wxEXPAND );
 #endif // wxUSE_LOG
 

-    SetAutoLayout( true );

     SetSizer( topsizer );
 }
 
     SetSizer( topsizer );
 }
 

diff --git a/samples/statbar/statbar.cpp b/samples/statbar/statbar.cpp
index 8915cd4c40c199cb5f4ad8f819ac847ede0cad6d..91cf5c9c90755e599ea8cdafc6e5b4d0f62f6d2f 100644 (file)
--- a/samples/statbar/statbar.cpp
+++ b/samples/statbar/statbar.cpp
@@ -576,10 +576,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent)
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(statbarBottom, 0, wxGROW);
 
     sizerTop->Add(-1, 10, 1, wxGROW);
     sizerTop->Add(statbarBottom, 0, wxGROW);
 

-    SetSizer(sizerTop);
-
-    sizerTop->Fit(this);
-    sizerTop->SetSizeHints(this);
+    SetSizerAndFit(sizerTop);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index e33d90679f50cfc0a5697be9d2c4dad373eb39d9..40a25e533f2fe5b3f5e6ba2833c363c7471a1428 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -1145,7 +1145,6 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
     topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 );
 #endif
 
     topSizer->Add( m_log, 1, wxALL | wxEXPAND, 10 );
 #endif
 

-    SetAutoLayout( true );

     SetSizer(topSizer);
 }
 
     SetSizer(topSizer);
 }
 

diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 1e06e50c3bba8a54086be67da30bfc023b415dc8..1637eb113b841050f47c30b7d6eb9fc1f654936b 100644 (file)
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -448,7 +448,6 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
 
     m_panel->SetSizer(sizerTop);
 
 
     m_panel->SetSizer(sizerTop);
 

-    sizerTop->Fit(this);

     sizerTop->SetSizeHints(this);
 
 #if USE_LOG && !defined(__WXCOCOA__)
     sizerTop->SetSizeHints(this);
 
 #if USE_LOG && !defined(__WXCOCOA__)

diff --git a/samples/wizard/wizard.cpp b/samples/wizard/wizard.cpp
index efb436c0d800646f3249ea3838065102d5d43269..d253471f7d5ad5a2ff7f32386809f7710091dc86 100644 (file)
--- a/samples/wizard/wizard.cpp
+++ b/samples/wizard/wizard.cpp
@@ -146,8 +146,7 @@ public:
             wxALL,
             5 // Border
         );
             wxALL,
             5 // Border
         );

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        SetSizerAndFit(mainSizer);

     }
 
     virtual bool TransferDataFromWindow()
     }
 
     virtual bool TransferDataFromWindow()


@@ -204,8 +203,7 @@ public:
             5 // Border
         );
 
             5 // Border
         );
 

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        SetSizerAndFit(mainSizer);

     }
 
     // wizard event handlers
     }
 
     // wizard event handlers


@@ -314,8 +312,7 @@ public:
         wxTextCtrl* textCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, textSize, wxTE_MULTILINE);
         mainSizer->Add(textCtrl, 0, wxALL|wxEXPAND, 5);
 
         wxTextCtrl* textCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, textSize, wxTE_MULTILINE);
         mainSizer->Add(textCtrl, 0, wxALL|wxEXPAND, 5);
 

-        SetSizer(mainSizer);
-        mainSizer->Fit(this);
+        SetSizerAndFit(mainSizer);

     }
 
     // implement wxWizardPage functions
     }
 
     // implement wxWizardPage functions