X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..a8853c78ed61849d3939dcc89cfbe8db07a2bbda:/samples/layout/layout.cpp diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp index fbec3d7dc0..c849af51ae 100644 --- a/samples/layout/layout.cpp +++ b/samples/layout/layout.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -45,7 +45,7 @@ MyApp::MyApp() bool MyApp::OnInit() { // Create the main frame window - frame = new MyFrame((MyFrame *) NULL, (char *) "wxWindows Layout Demo", 0, 0, 550, 500); + frame = new MyFrame(NULL, _T("wxWindows Layout Demo"), -1, -1, 400, 300); frame->SetAutoLayout(TRUE); @@ -55,71 +55,64 @@ bool MyApp::OnInit() // Make a menubar wxMenu *file_menu = new wxMenu; - file_menu->Append(LAYOUT_LOAD_FILE, "&Load file", "Load a text file"); - file_menu->Append(LAYOUT_TEST_SIZER, "&Test sizers", "Test sizer"); - file_menu->Append(LAYOUT_TEST_NB, "&Test notebook sizers", "Test notebook sizer"); + file_menu->Append(LAYOUT_TEST_SIZER, _T("&Test sizers"), _T("Test sizer")); + file_menu->Append(LAYOUT_TEST_NB, _T("&Test notebook sizers"), _T("Test notebook sizer")); file_menu->AppendSeparator(); - file_menu->Append(LAYOUT_QUIT, "E&xit", "Quit program"); + file_menu->Append(LAYOUT_QUIT, _T("E&xit"), _T("Quit program")); wxMenu *help_menu = new wxMenu; - help_menu->Append(LAYOUT_ABOUT, "&About", "About layout demo"); + help_menu->Append(LAYOUT_ABOUT, _T("&About"), _T("About layout demo")); menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(help_menu, "&Help"); + menu_bar->Append(file_menu, _T("&File")); + menu_bar->Append(help_menu, _T("&Help")); // Associate the menu bar with the frame frame->SetMenuBar(menu_bar); // Make a panel - frame->panel = new wxPanel(frame, 0, 0, 1000, 500, wxTAB_TRAVERSAL); - frame->panel->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); -// frame->panel->SetAutoLayout(TRUE); + wxPanel *panel = new wxPanel(frame); // Create some panel items - wxButton *btn1 = new wxButton(frame->panel, -1, "A button (1)") ; + wxButton *btn1 = new wxButton(panel, -1, _T("A button (1)")) ; wxLayoutConstraints *b1 = new wxLayoutConstraints; - b1->centreX.SameAs (frame->panel, wxCentreX); - b1->top.SameAs (frame->panel, wxTop, 5); - b1->width.PercentOf (frame->panel, wxWidth, 80); - b1->height.PercentOf (frame->panel, wxHeight, 10); + b1->centreX.SameAs (panel, wxCentreX); + b1->top.SameAs (panel, wxTop, 5); + b1->width.PercentOf (panel, wxWidth, 80); + b1->height.AsIs (); btn1->SetConstraints(b1); - wxListBox *list = new wxListBox(frame->panel, -1, + wxListBox *list = new wxListBox(panel, -1, wxPoint(-1, -1), wxSize(200, 100)); - list->Append("Apple"); - list->Append("Pear"); - list->Append("Orange"); - list->Append("Banana"); - list->Append("Fruit"); + list->Append(_T("Apple")); + list->Append(_T("Pear")); + list->Append(_T("Orange")); + list->Append(_T("Banana")); + list->Append(_T("Fruit")); wxLayoutConstraints *b2 = new wxLayoutConstraints; b2->top.Below (btn1, 5); - b2->left.SameAs (frame->panel, wxLeft, 5); - b2->width.PercentOf (frame->panel, wxWidth, 40); - b2->bottom.SameAs (frame->panel, wxBottom, 5); + b2->left.SameAs (panel, wxLeft, 5); + b2->width.PercentOf (panel, wxWidth, 40); + b2->bottom.SameAs (panel, wxBottom, 5); list->SetConstraints(b2); - wxTextCtrl *mtext = new wxTextCtrl(frame->panel, -1, "Some text", - wxPoint(-1, -1), wxSize(150, 100)); + wxTextCtrl *mtext = new wxTextCtrl(panel, -1, _T("Some text")); wxLayoutConstraints *b3 = new wxLayoutConstraints; b3->top.Below (btn1, 5); b3->left.RightOf (list, 5); - b3->right.SameAs (frame->panel, wxRight, 5); - b3->bottom.SameAs (frame->panel, wxBottom, 5); + b3->right.SameAs (panel, wxRight, 5); + b3->bottom.SameAs (panel, wxBottom, 5); mtext->SetConstraints(b3); - frame->canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED); - - // Give it scrollbars: the virtual canvas is 20 * 50 = 1000 pixels in each direction -// canvas->SetScrollbars(20, 20, 50, 50, 4, 4); + MyWindow *canvas = new MyWindow(frame, 0, 0, 400, 400, wxRETAINED); // Make a text window - frame->text_window = new MyTextWindow(frame, 0, 250, 400, 250); + MyTextWindow *text_window = new MyTextWindow(frame, 0, 250, 400, 150); // Set constraints for panel subwindow wxLayoutConstraints *c1 = new wxLayoutConstraints; @@ -129,32 +122,33 @@ bool MyApp::OnInit() c1->right.PercentOf (frame, wxWidth, 50); c1->height.PercentOf (frame, wxHeight, 50); - frame->panel->SetConstraints(c1); + panel->SetConstraints(c1); // Set constraints for canvas subwindow wxLayoutConstraints *c2 = new wxLayoutConstraints; - c2->left.SameAs (frame->panel, wxRight); + c2->left.SameAs (panel, wxRight); c2->top.SameAs (frame, wxTop); c2->right.SameAs (frame, wxRight); c2->height.PercentOf (frame, wxHeight, 50); - frame->canvas->SetConstraints(c2); + canvas->SetConstraints(c2); // Set constraints for text subwindow wxLayoutConstraints *c3 = new wxLayoutConstraints; c3->left.SameAs (frame, wxLeft); - c3->top.Below (frame->panel); + c3->top.Below (panel); c3->right.SameAs (frame, wxRight); c3->bottom.SameAs (frame, wxBottom); - frame->text_window->SetConstraints(c3); + text_window->SetConstraints(c3); frame->Show(TRUE); - frame->SetStatusText("wxWindows layout demo"); + frame->SetStatusText(_T("wxWindows layout demo")); SetTopWindow(frame); + return TRUE; } @@ -163,49 +157,32 @@ bool MyApp::OnInit() //----------------------------------------------------------------- // 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)) +MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h) + : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)) { - panel = (wxPanel *) NULL; - text_window = (MyTextWindow *) NULL; - canvas = (MyWindow *) NULL; } BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(LAYOUT_LOAD_FILE, MyFrame::LoadFile) - EVT_MENU(LAYOUT_QUIT, MyFrame::Quit) + EVT_MENU(LAYOUT_QUIT, MyFrame::OnQuit) EVT_MENU(LAYOUT_TEST_SIZER, MyFrame::TestSizers) EVT_MENU(LAYOUT_TEST_NB, MyFrame::TestNotebookSizers) EVT_MENU(LAYOUT_ABOUT, MyFrame::About) - EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() -void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) ) -{ - wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, - (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") ); - if (s != "") - { -#ifdef __WXMSW__ - frame->text_window->LoadFile(s); -#endif - } -} - -void MyFrame::Quit(wxCommandEvent& WXUNUSED(event) ) +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) ) { - this->Close(TRUE); + Close(TRUE); } void MyFrame::TestSizers(wxCommandEvent& WXUNUSED(event) ) { - MySizerFrame *newFrame = new MySizerFrame((MyFrame *) NULL, "Sizer Test Frame", 50, 50 ); + MySizerFrame *newFrame = new MySizerFrame(NULL, _T("Sizer Test Frame"), 50, 50); newFrame->Show(TRUE); } void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) { - wxDialog dialog( this, -1, wxString("Notebook Sizer Test Dialog") ); + wxDialog dialog( this, -1, wxString(_T("Notebook Sizer Test Dialog")) ); // Begin with first hierarchy: a notebook at the top and // and OK button at the bottom. @@ -216,24 +193,24 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) wxNotebookSizer *nbs = new wxNotebookSizer( notebook ); topsizer->Add( nbs, 1, wxGROW ); - wxButton *button = new wxButton( &dialog, wxID_OK, "OK" ); + wxButton *button = new wxButton( &dialog, wxID_OK, _T("OK") ); topsizer->Add( button, 0, wxALIGN_RIGHT | wxALL, 10 ); // First page: one big text ctrl - wxTextCtrl *multi = new wxTextCtrl( notebook, -1, "TextCtrl.", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); - notebook->AddPage( multi, "Page One" ); + wxTextCtrl *multi = new wxTextCtrl( notebook, -1, _T("TextCtrl."), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); + notebook->AddPage( multi, _T("Page One") ); // Second page: a text ctrl and a button wxPanel *panel = new wxPanel( notebook, -1 ); - notebook->AddPage( panel, "Page Two" ); + notebook->AddPage( panel, _T("Page Two") ); wxSizer *panelsizer = new wxBoxSizer( wxVERTICAL ); - wxTextCtrl *text = new wxTextCtrl( panel, -1, "TextLine 1.", wxDefaultPosition, wxSize(250,-1) ); + wxTextCtrl *text = new wxTextCtrl( panel, -1, _T("TextLine 1."), wxDefaultPosition, wxSize(250,-1) ); panelsizer->Add( text, 0, wxGROW|wxALL, 30 ); - text = new wxTextCtrl( panel, -1, "TextLine 2.", wxDefaultPosition, wxSize(250,-1) ); + text = new wxTextCtrl( panel, -1, _T("TextLine 2."), wxDefaultPosition, wxSize(250,-1) ); panelsizer->Add( text, 0, wxGROW|wxALL, 30 ); - wxButton *button2 = new wxButton( panel, -1, "Hallo" ); + wxButton *button2 = new wxButton( panel, -1, _T("Hallo") ); panelsizer->Add( button2, 0, wxALIGN_RIGHT | wxLEFT|wxRIGHT|wxBOTTOM, 30 ); panel->SetAutoLayout( TRUE ); @@ -252,18 +229,32 @@ void MyFrame::TestNotebookSizers(wxCommandEvent& WXUNUSED(event) ) void MyFrame::About(wxCommandEvent& WXUNUSED(event) ) { - (void)wxMessageBox("wxWindows GUI library layout demo\n", - "About Layout Demo", wxOK|wxCENTRE); + (void)wxMessageBox(_T("wxWindows GUI library layout demo\n"), + _T("About Layout Demo"), wxOK|wxCENTRE); } -// Size the subwindows when the frame is resized -void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event) ) +//----------------------------------------------------------------- +// MyWindow +//----------------------------------------------------------------- + +BEGIN_EVENT_TABLE(MyWindow, wxWindow) + EVT_PAINT(MyWindow::OnPaint) +END_EVENT_TABLE() + +// Define a constructor for my canvas +MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style) + : wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style) { - Layout(); } -void MyFrame::Draw(wxDC& dc, bool WXUNUSED(draw_bitmaps) ) +MyWindow::~MyWindow() { +} + +// Define the repainting behaviour +void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) ) +{ + wxPaintDC dc(this); dc.SetPen(* wxGREEN_PEN); dc.DrawLine(0, 0, 200, 200); dc.DrawLine(200, 0, 0, 200); @@ -284,37 +275,12 @@ 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() - -// Define a constructor for my canvas -MyWindow::MyWindow(wxFrame *frame, int x, int y, int w, int h, long style): - wxWindow(frame, -1, wxPoint(x, y), wxSize(w, h), style) -{ -} - -MyWindow::~MyWindow() -{ -} - -// Define the repainting behaviour -void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) ) -{ - wxPaintDC dc(this); - frame->Draw(dc,TRUE); -} - //----------------------------------------------------------------- // MySizerFrame //----------------------------------------------------------------- -MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): - wxFrame(frame, -1, title, wxPoint(x, y) ) +MySizerFrame::MySizerFrame(wxFrame *frame, wxChar *title, int x, int y ) + : wxFrame(frame, -1, title, wxPoint(x, y) ) { // we want to get a dialog that is stretchable because it // has a text ctrl in the middle. at the bottom, we have @@ -324,7 +290,7 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): // 1) top: create wxStaticText with minimum size equal to its default size topsizer->Add( - new wxStaticText( this, -1, "An explanation (wxALIGN_RIGHT)." ), + new wxStaticText( this, -1, _T("An explanation (wxALIGN_RIGHT).") ), 0, // make vertically unstretchable wxALIGN_RIGHT | // right align text wxTOP | wxLEFT | wxRIGHT, // make border all around except wxBOTTOM @@ -332,7 +298,7 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): // 2) top: create wxTextCtrl with minimum size (100x60) topsizer->Add( - new wxTextCtrl( this, -1, "My text (wxEXPAND).", wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), + new wxTextCtrl( this, -1, _T("My text (wxEXPAND)."), wxDefaultPosition, wxSize(100,60), wxTE_MULTILINE), 1, // make vertically stretchable wxEXPAND | // make horizontally stretchable wxALL, // and make border all around @@ -340,10 +306,10 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): // 2.5) Gratuitous test of wxStaticBoxSizers wxBoxSizer *statsizer = new wxStaticBoxSizer( - new wxStaticBox(this, -1, "A wxStaticBoxSizer"), + new wxStaticBox(this, -1, _T("A wxStaticBoxSizer")), wxVERTICAL ); statsizer->Add( - new wxStaticText(this, -1, "And some TEXT inside it"), + new wxStaticText(this, -1, _T("And some TEXT inside it")), 0, wxCENTER | wxALL, @@ -352,17 +318,17 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): // 2.7) And a test of wxGridSizer wxGridSizer *gridsizer = new wxGridSizer(2, 5, 5); - gridsizer->Add(new wxStaticText(this, -1, "Label"), 0, + gridsizer->Add(new wxStaticText(this, -1, _T("Label")), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, "Grid sizer demo"), 1, + gridsizer->Add(new wxTextCtrl(this, -1, _T("Grid sizer demo")), 1, wxGROW | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxStaticText(this, -1, "Another label"), 0, + gridsizer->Add(new wxStaticText(this, -1, _T("Another label")), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, "More text"), 1, + gridsizer->Add(new wxTextCtrl(this, -1, _T("More text")), 1, wxGROW | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxStaticText(this, -1, "Final label"), 0, + gridsizer->Add(new wxStaticText(this, -1, _T("Final label")), 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL); - gridsizer->Add(new wxTextCtrl(this, -1, "And yet more text"), 1, + gridsizer->Add(new wxTextCtrl(this, -1, _T("And yet more text")), 1, wxGROW | wxALIGN_CENTER_VERTICAL); topsizer->Add(gridsizer, 1, wxGROW | wxALL, 10); @@ -379,12 +345,12 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): // 4) bottom: create two centred wxButtons wxBoxSizer *button_box = new wxBoxSizer( wxHORIZONTAL ); button_box->Add( - new wxButton( this, -1, "Two buttons in a box" ), + new wxButton( this, -1, _T("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)" ), + new wxButton( this, -1, _T("(wxCENTER)") ), 0, // make horizontally unstretchable wxALL, // make border all around 7 ); // set border width to 7 @@ -394,12 +360,8 @@ MySizerFrame::MySizerFrame(wxFrame *frame, char *title, int x, int y ): 0, // make vertically unstretchable wxCENTER ); // no border and centre horizontally - SetAutoLayout( TRUE ); - - // set frame to minimum size - topsizer->Fit( this ); - - // don't allow frame to get smaller than what the sizers tell ye + // don't allow frame to get smaller than what the sizers tell it and also set + // the initial size as calculated by the sizers topsizer->SetSizeHints( this ); SetSizer( topsizer );