X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58580a7e3cf744de919827f827f14e595f8231af..c0b0635cf69537ca32377bad5650b39402cb21b6:/contrib/samples/gizmos/multicell/mtest.cpp?ds=sidebyside diff --git a/contrib/samples/gizmos/multicell/mtest.cpp b/contrib/samples/gizmos/multicell/mtest.cpp index 3b1d70b993..1254de9926 100644 --- a/contrib/samples/gizmos/multicell/mtest.cpp +++ b/contrib/samples/gizmos/multicell/mtest.cpp @@ -1,194 +1,196 @@ /* - * File: mtest.cpp - * Purpose: wxMultiCellSizer and wxMultiCellCanvas test - * Author: Alex Andruschak - * Created: 2000 - * Updated: + * File: mtest.cpp + * Purpose: wxMultiCellSizer and wxMultiCellCanvas test + * Author: Alex Andruschak + * Created: 2000 + * Updated: * Copyright: */ static const char sccsid[] = "%W% %G%"; -#ifdef __GNUG__ - #pragma implementation - #pragma interface +#if defined(__GNUG__) && !defined(__APPLE__) + #pragma implementation + #pragma interface #endif #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP - #include "wx/wx.h" + #include "wx/wx.h" #endif #include "wx/gizmos/multicell.h" class MyApp: public wxApp {public: - bool OnInit(void); + bool OnInit(void); }; class MyFrame: public wxFrame { public: - MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size); + MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size); - void OnCloseWindow(wxCloseEvent& event); - void OnPaint(wxPaintEvent& event); - wxMultiCellSizer *sizer; + void OnCloseWindow(wxCloseEvent& event); + void OnPaint(wxPaintEvent& event); + wxMultiCellSizer *sizer; - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; IMPLEMENT_APP(MyApp) bool MyApp::OnInit(void) { - MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, (char *) "wxMultiCellSizer Sample", wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500)); + MyFrame *frame = new MyFrame(1, (wxFrame *) NULL, wxT("wxMultiCellSizer Sample"), wxPoint(50, 50), wxDefaultSize); //, wxSize(600, 500)); - frame->Show(TRUE); + frame->Show(true); - SetTopWindow(frame); - frame = new MyFrame(2, (wxFrame *) NULL, (char *) "wxMultiCellCanvas Sample", wxPoint(100, 100), wxSize(600, 500)); + SetTopWindow(frame); + frame = new MyFrame(2, (wxFrame *) NULL, wxT("wxMultiCellCanvas Sample"), wxPoint(100, 100), wxSize(600, 500)); - frame->Show(TRUE); + frame->Show(true); - SetTopWindow(frame); - return TRUE; + SetTopWindow(frame); + return true; } MyFrame::MyFrame(int type, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size): -wxFrame(frame, -1, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL) +wxFrame(frame, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL) { - CreateStatusBar(1); - sizer = NULL; - if (type == 1) - { - // create sizer 4 columns 5 rows - wxSize aa(4,9); - sizer = new wxMultiCellSizer(aa); - sizer->SetDefaultCellSize(wxSize(15,15)); - sizer->SetRowHeight(7,5,TRUE); - sizer->SetRowHeight(8,5,FALSE); - // add first row - sizer->Add( - new wxButton( this, -1, "B1 - 0,0, horizontal resizable" ), - 0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZENTAL_RESIZABLE, wxSize(2,2))); - sizer->Add( - new wxButton( this, -1, "B2 - 0,1, vertical resizable" ), - 0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2))); - sizer->Add( - new wxButton( this, -1, "B3 - 0,2" ), - 0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER)); - sizer->Add( - new wxStaticText(this, -1, "jbb 0,3, lower-right"), - 0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT)); - - // add button for secord row - sizer->Add( - new wxTextCtrl(this, -1, "Text control - 1,0, 4 cols wide"), - 0, 0, 0, new wxMultiCellItemHandle(1,0,1,4)); - - // add buttons for next row - sizer->Add( - new wxButton( this, -1, "B6 - 2,0, 2 cols wide" ), - 0, 0, 0, new wxMultiCellItemHandle(2,0,1,2)); - sizer->Add( - new wxButton( this, -1, "B7 - 2,3" ), - 0, 0, 0, new wxMultiCellItemHandle(2,3,1,1)); - - // and last additions - sizer->Add( - new wxButton( this, -1, "B8 - 3,0, 4 rows high, vert resizable" ), - 0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE)); - sizer->Add( - new wxButton( this, -1, "B9 - 3,2, 2 cols wide, vert resizable" ), - 0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE)); - sizer->Add( - new wxButton( this, -1, "B10 - 4,1, 3 cols wide, vert resizable" ), - 0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE)); - - sizer->Add( - new wxButton( this, -1, "B11 - 5,1, 3 cols wide" ), - 0, 0, 0, new wxMultiCellItemHandle(5,1,1,3)); - - sizer->Add( - new wxButton( this, -1, "B12 - 6,1, 3 cols wide" ), - 0, 0, 0, new wxMultiCellItemHandle(6,1,1,3)); - - sizer->Add( - new wxButton( this, -1, "B13 - 7,1, 2 cols wide" ), - 0, 0, 0, new wxMultiCellItemHandle(7,1,1,2)); - - sizer->Add( - new wxButton( this, -1, "B14 - 8,1, 3 cols wide" ), - 0, 0, 0, new wxMultiCellItemHandle(8,1,1,3)); - - SetAutoLayout( TRUE ); -// sizer->SetMinSize(sizer->CalcMin()); - SetSizer( sizer ); - wxSize s = sizer->CalcMin(); - wxSize c = GetSize() - GetClientSize(); - SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight()); - sizer->EnableGridLines(this); - } - else - { - // create sizer 4 columns 5 rows - wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5); - - // add first row - sizer->Add( - new wxButton( this, -1, "Button 1" ), - 0, 0); - sizer->Add( - new wxButton( this, -1, "Button 2" ), - 0, 1); - sizer->Add( - new wxButton( this, -1, "Button 3" ), - 0, 2); - sizer->Add( - new wxStaticText(this, -1, "jbb test"), - 0, 3); - - sizer->Add( - new wxStaticText(this, -1, "jbb test 2"), - 0, 4); - - // add button for secord row - sizer->Add( - new wxTextCtrl(this, -1, "Text control"), - 1, 0); - - // add buttons for next row - sizer->Add( - new wxButton( this, -1, "Button 6" ), - 2, 0); - sizer->Add( - new wxButton( this, -1, "Button 7" ), - 2, 3); - - // and last additions - sizer->Add( - new wxButton( this, -1, "Button 8" ), - 3, 0); - sizer->Add( - new wxButton( this, -1, "Button 9" ), - 3, 1); - sizer->Add( - new wxButton( this, -1, "Button 10" ), - 4, 1); - - sizer->CalculateConstraints(); - SetSizer( sizer ); - SetAutoLayout( TRUE ); - } +#if wxUSE_STATUSBAR + CreateStatusBar(1); +#endif // wxUSE_STATUSBAR + sizer = NULL; + if (type == 1) + { + // create sizer 4 columns 5 rows + wxSize aa(4,9); + sizer = new wxMultiCellSizer(aa); + sizer->SetDefaultCellSize(wxSize(15,15)); + sizer->SetRowHeight(7,5,true); + sizer->SetRowHeight(8,5,false); + // add first row + sizer->Add( + new wxButton( this, wxID_ANY, wxT( "B1 - 0,0, horizontal resizable")), + 0, 0, 0, new wxMultiCellItemHandle(0,0,1,1, wxDefaultSize, wxHORIZONTAL_RESIZABLE, wxSize(2,2))); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B2 - 0,1, vertical resizable")), + 0, 0, 0, new wxMultiCellItemHandle(0,1,1,1, wxDefaultSize, wxVERTICAL_RESIZABLE, wxSize(2, 2))); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B3 - 0,2")), + 0, 0, 0, new wxMultiCellItemHandle(0,2,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_CENTER_HORIZONTAL)); //, wxALIGN_CENTER)); + sizer->Add( + new wxStaticText(this, wxID_ANY, wxT("jbb 0,3, lower-right")), + 0, 0, 0, new wxMultiCellItemHandle(0,3,1,1, wxDefaultSize, wxNOT_RESIZABLE, wxSize(1,1), wxALIGN_BOTTOM | wxALIGN_RIGHT)); + + // add button for secord row + sizer->Add( + new wxTextCtrl(this, wxID_ANY, wxT("Text control - 1,0, 4 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(1,0,1,4)); + + // add buttons for next row + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B6 - 2,0, 2 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(2,0,1,2)); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B7 - 2,3")), + 0, 0, 0, new wxMultiCellItemHandle(2,3,1,1)); + + // and last additions + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B8 - 3,0, 4 rows high, vert resizable")), + 0, 0, 0, new wxMultiCellItemHandle(3,0,4,1,wxDefaultSize, wxVERTICAL_RESIZABLE)); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B9 - 3,2, 2 cols wide, vert resizable")), + 0, 0, 0, new wxMultiCellItemHandle(3,2,1,2,wxDefaultSize, wxVERTICAL_RESIZABLE)); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B10 - 4,1, 3 cols wide, vert resizable")), + 0, 0, 0, new wxMultiCellItemHandle(4,1,1,3,wxDefaultSize, wxVERTICAL_RESIZABLE)); + + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B11 - 5,1, 3 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(5,1,1,3)); + + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B12 - 6,1, 3 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(6,1,1,3)); + + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B13 - 7,1, 2 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(7,1,1,2)); + + sizer->Add( + new wxButton( this, wxID_ANY, wxT("B14 - 8,1, 3 cols wide")), + 0, 0, 0, new wxMultiCellItemHandle(8,1,1,3)); + + SetAutoLayout( true ); +// sizer->SetMinSize(sizer->CalcMin()); + SetSizer( sizer ); + wxSize s = sizer->CalcMin(); + wxSize c = GetSize() - GetClientSize(); + SetSizeHints(s.GetWidth() + c.GetWidth() , s.GetHeight() + c.GetHeight()); + sizer->EnableGridLines(this); + } + else + { + // create sizer 4 columns 5 rows + wxMultiCellCanvas *sizer = new wxMultiCellCanvas(this, 5,5); + + // add first row + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 1")), + 0, 0); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 2")), + 0, 1); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 3")), + 0, 2); + sizer->Add( + new wxStaticText(this, wxID_ANY, wxT("jbb test")), + 0, 3); + + sizer->Add( + new wxStaticText(this, wxID_ANY, wxT("jbb test 2")), + 0, 4); + + // add button for secord row + sizer->Add( + new wxTextCtrl(this, wxID_ANY, wxT("Text control")), + 1, 0); + + // add buttons for next row + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 6")), + 2, 0); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 7")), + 2, 3); + + // and last additions + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 8")), + 3, 0); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 9")), + 3, 1); + sizer->Add( + new wxButton( this, wxID_ANY, wxT("Button 10")), + 4, 1); + + sizer->CalculateConstraints(); + SetSizer( sizer ); + SetAutoLayout( true ); + } } // Define the repainting behaviour @@ -200,16 +202,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) void MyFrame::OnPaint(wxPaintEvent& WXUNUSED(event) ) { - wxPaintDC dc(this); + wxPaintDC dc(this); - if (sizer) - { - sizer->OnPaint(dc); - } + if (sizer) + { + sizer->OnPaint(dc); + } } -void MyFrame::OnCloseWindow(wxCloseEvent& event) +void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - Destroy(); + Destroy(); }