X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/227869da8d090e2364530dd310e2d63ad18edecf..b4fe51258d17c1e63c55b2b83c8db83e44b15927:/samples/layout/layout.cpp diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index e33b97fad9..14532691e3 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -21,10 +21,13 @@ #endif #if !wxUSE_CONSTRAINTS -#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h! +#error You must set wxUSE_CONSTRAINTS to 1 in setup.h! #endif #include +#include "wx/sizer.h" +#include "wx/statline.h" + #include "layout.h" // Declare two frames @@ -51,7 +54,7 @@ bool MyApp::OnInit(void) wxMenu *file_menu = new wxMenu; file_menu->Append(LAYOUT_LOAD_FILE, "&Load file", "Load a text file"); - file_menu->Append(LAYOUT_TEST, "&Test sizers", "Test sizer code"); + file_menu->Append(LAYOUT_TEST_NEW, "&Test new sizers", "Test new sizer code"); file_menu->AppendSeparator(); file_menu->Append(LAYOUT_QUIT, "E&xit", "Quit program"); @@ -69,7 +72,7 @@ bool MyApp::OnInit(void) // Make a panel frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL); - frame->panel->SetBackgroundColour(wxColour(192, 192, 192)); + frame->panel->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); // frame->panel->SetAutoLayout(TRUE); // Create some panel items @@ -152,6 +155,10 @@ bool MyApp::OnInit(void) return TRUE; } +//----------------------------------------------------------------- +// MyFrame +//----------------------------------------------------------------- + // Define my frame constructor MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) @@ -164,14 +171,15 @@ MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h): BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile) EVT_MENU(LAYOUT_QUIT, MyFrame::Quit) - EVT_MENU(LAYOUT_TEST, MyFrame::TestSizers) + EVT_MENU(LAYOUT_TEST_NEW, MyFrame::TestNewSizers) EVT_MENU(LAYOUT_ABOUT, MyFrame::About) EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) ) { - wxString s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt"); + wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, + (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") ); if (s != "") { #ifdef __WXMSW__ @@ -185,9 +193,9 @@ void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) ) this->Close(TRUE); } -void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::TestNewSizers(wxCommandEvent& WXUNUSED(event) ) { - SizerFrame *newFrame = new SizerFrame((MyFrame *) NULL, (char *) "Sizer Test Frame", 50, 50, 500, 500); + NewSizerFrame *newFrame = new NewSizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 ); newFrame->Show(TRUE); } @@ -223,6 +231,10 @@ void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) ) dc.DrawArc(50, 300, 100, 250, 100, 300 ); } +//----------------------------------------------------------------- +// MyWindow +//----------------------------------------------------------------- + BEGIN_EVENT_TABLE(MyWindow, wxWindow) EVT_PAINT(MyWindow::OnPaint) END_EVENT_TABLE() @@ -244,112 +256,74 @@ void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) ) frame->Draw(dc,TRUE); } -// Define the behaviour for the frame closing -// - must delete all frames except for the main one. -bool MyFrame::OnClose(void) -{ - Show(FALSE); - - return TRUE; -} +//----------------------------------------------------------------- +// NewSizerFrame +//----------------------------------------------------------------- -SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h): - wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) +NewSizerFrame::NewSizerFrame(wxFrame *frame, char *title, int x, int y ): + wxFrame(frame, -1, title, wxPoint(x, y) ) { - panel = new wxPanel(this, -1, wxPoint(0, 0), wxSize(-1, -1), wxTAB_TRAVERSAL); - panel->SetBackgroundColour(wxColour(192, 192, 192)); - - // A sizer to fit the whole panel, plus two sizers, one - // above the other. A button is centred on the lower - // sizer; a rowcol containing 3 buttons is centred on the upper - // sizer. - wxSizer *expandSizer = new wxSizer(panel, wxSizerExpand); - expandSizer->SetName("expandSizer"); - - wxLayoutConstraints *c; - - /////// TOP OF PANEL - /////// - wxSizer *topSizer = new wxSizer(expandSizer); - topSizer->SetName("topSizer"); - - // Specify constraints for the top sizer - c = new wxLayoutConstraints; - c->left.SameAs (expandSizer, wxLeft); - c->top.SameAs (expandSizer, wxTop); - c->right.SameAs (expandSizer, wxRight); - c->height.PercentOf (expandSizer, wxHeight, 50); - - topSizer->SetConstraints(c); - - /* - * Add a row-col sizer and some buttons - */ - - // Default is layout by rows, 20 columns per row, shrink to fit. - wxRowColSizer *rowCol = new wxRowColSizer(topSizer); - rowCol->SetName("rowCol"); - - wxButton *button = new wxButton(panel, -1, "Button 1"); - rowCol->AddSizerChild(button); - - button = new wxButton(panel, -1, "Button 2"); - rowCol->AddSizerChild(button); - - button = new wxButton(panel, -1, "Button 3"); - rowCol->AddSizerChild(button); - - // Centre the rowcol in the middle of the upper sizer - c = new wxLayoutConstraints; - c->centreX.SameAs (topSizer, wxCentreX); - c->centreY.SameAs (topSizer, wxCentreY); - c->width.AsIs(); - c->height.AsIs(); - rowCol->SetConstraints(c); - - /////// BOTTOM OF PANEL - /////// - wxSizer *bottomSizer = new wxSizer(expandSizer); - - // Specify constraints for the bottom sizer - c = new wxLayoutConstraints; - c->left.SameAs (expandSizer, wxLeft); - c->top.PercentOf (expandSizer, wxHeight, 50); - c->right.SameAs (expandSizer, wxRight); - c->height.PercentOf (expandSizer, wxHeight, 50); - - bottomSizer->SetConstraints(c); - - wxButton *button2 = new wxButton(panel, -1, "Test button"); - - // The button should be a child of the bottom sizer - bottomSizer->AddSizerChild(button2); - - // Centre the button on the sizer - c = new wxLayoutConstraints; - c->centreX.SameAs (bottomSizer, wxCentreX); - c->centreY.SameAs (bottomSizer, wxCentreY); - c->width.PercentOf (bottomSizer, wxWidth, 20); - c->height.PercentOf (bottomSizer, wxHeight, 20); - button2->SetConstraints(c); -} - -BEGIN_EVENT_TABLE(SizerFrame, wxFrame) - EVT_SIZE(SizerFrame::OnSize) -END_EVENT_TABLE() + // we want to get a dialog that is stretchable because it + // has a text ctrl in the middle. at the bottom, we have + // two buttons which. + wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL ); + + // 1) top: create wxStaticText with minimum size equal to its default size + topsizer->Add( + new wxStaticText( this, -1, "An explanation (wxALIGN_RIGHT)." ), + 0, // make vertically unstretchable + wxALIGN_RIGHT | // right align text + wxTOP | wxLEFT | wxRIGHT, // make border all around except wxBOTTOM + 5 ); // set border width to 5 + + // 2) top: create wxTextCtrl with minimum size (100x60) + topsizer->Add( + new wxTextCtrl( this, -1, "My text (wxEXPAND).", wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), + 1, // make vertically stretchable + wxEXPAND | // make horizontally stretchable + wxALL, // and make border all around + 5 ); // set border width to 5 + + + // 3) middle: create wxStaticLine with minimum size (3x3) + topsizer->Add( + new wxStaticLine( this, -1, wxDefaultPosition, wxSize(3,3), wxHORIZONTAL), + 0, // make vertically unstretchable + wxEXPAND | // make horizontally stretchable + wxALL, // and make border all around + 5 ); // set border width to 5 + + + // 4) bottom: create two centred wxButtons + wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); + button_box->Add( + new wxButton( this, -1, "Two buttons in a box" ), + 0, // make horizontally unstretchable + wxALL, // make border all around + 7 ); // set border width to 7 + button_box->Add( + new wxButton( this, -1, "(wxCENTER)" ), + 0, // make horizontally unstretchable + wxALL, // make border all around + 7 ); // set border width to 7 + + topsizer->Add( + button_box, + 0, // make vertically unstretchable + wxCENTER ); // no border and centre horizontally -// Size the subwindows when the frame is resized -void SizerFrame::OnSize(wxSizeEvent& event) -{ - wxFrame::OnSize(event); - panel->Layout(); + + // set frame to minimum size + topsizer->Fit( this ); + + // don't allow frame to get smaller than what the sizers tell ye + topsizer->SetSizeHints( this ); + + SetSizer( topsizer ); + + SetAutoLayout( TRUE ); } -bool SizerFrame::OnClose(void) -{ - Show(FALSE); - return TRUE; -}