X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa453eca5718f7b7e59ecce1984aa9874f631a2..460354e939bc52de1b5a749b6d88d6ef21f5827b:/samples/mdi/mdi.cpp?ds=sidebyside diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index 203f6f9898..24f0741ccb 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -72,7 +72,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(MDI_QUIT, MyFrame::OnQuit) EVT_CLOSE(MyFrame::OnClose) - + EVT_ICONIZE(MyFrame::OnIconize) EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() @@ -109,8 +109,8 @@ bool MyApp::OnInit() { // Create the main frame window - frame = new MyFrame((wxFrame *)NULL, -1, _T("MDI Demo"), - wxPoint(-1, -1), wxSize(500, 400), + frame = new MyFrame((wxFrame *)NULL, wxID_ANY, _T("MDI Demo"), + wxDefaultPosition, wxSize(500, 400), wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); #ifdef __WXMSW__ #if 0 @@ -145,13 +145,15 @@ bool MyApp::OnInit() // Associate the menu bar with the frame frame->SetMenuBar(menu_bar); +#if wxUSE_STATUSBAR frame->CreateStatusBar(); +#endif // wxUSE_STATUSBAR - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -168,7 +170,7 @@ MyFrame::MyFrame(wxWindow *parent, : wxMDIParentFrame(parent, id, title, pos, size, style | wxNO_FULL_REPAINT_ON_RESIZE) { - textWindow = new wxTextCtrl(this, -1, _T("A help window"), + textWindow = new wxTextCtrl(this, wxID_ANY, _T("A help window"), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxSUNKEN_BORDER); @@ -211,7 +213,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - (void)wxMessageBox(_T("wxWindows 2.0 MDI Demo\n") + (void)wxMessageBox(_T("wxWidgets 2.0 MDI Demo\n") _T("Author: Julian Smart (c) 1997\n") _T("Usage: mdi.exe"), _T("About MDI Demo")); } @@ -219,9 +221,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) { // Make another frame, containing a canvas - MyChild *subframe = new MyChild(frame, _T("Canvas Frame"), - wxPoint(-1, -1), wxSize(-1, -1), - wxDEFAULT_FRAME_STYLE); + MyChild *subframe = new MyChild(frame, _T("Canvas Frame")); wxString title; title.Printf(_T("Canvas Frame %d"), ++gs_nFrames); @@ -262,8 +262,10 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) // Associate the menu bar with the frame subframe->SetMenuBar(menu_bar); +#if wxUSE_STATUSBAR subframe->CreateStatusBar(); subframe->SetStatusText(title); +#endif // wxUSE_STATUSBAR int width, height; subframe->GetClientSize(&width, &height); @@ -274,7 +276,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) // Give it scrollbars canvas->SetScrollbars(20, 20, 50, 50); - subframe->Show(TRUE); + subframe->Show(true); } void MyFrame::OnSize(wxSizeEvent& @@ -299,6 +301,12 @@ void MyFrame::OnSize(wxSizeEvent& #endif } +void MyFrame::OnIconize(wxIconizeEvent& event) +{ + wxSizeEvent e; + OnSize (e) ; +} + #if wxUSE_TOOLBAR void MyFrame::InitToolBar(wxToolBar* toolBar) { @@ -316,24 +324,24 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) int width = 24; int currentX = 5; - toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("New file")); + toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("New file")); currentX += width + 5; - toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Open file")); + toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Open file")); currentX += width + 5; - toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Save file")); + toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Save file")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Copy")); + toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Copy")); currentX += width + 5; - toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Cut")); + toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Cut")); currentX += width + 5; - toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Paste")); + toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Paste")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Print")); + toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Print")); currentX += width + 5; toolBar->AddSeparator(); - toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, _T("Help")); + toolBar->AddTool( MDI_ABOUT, *bitmaps[7], wxNullBitmap, true, currentX, wxDefaultCoord, (wxObject *) NULL, _T("Help")); toolBar->Realize(); @@ -349,14 +357,14 @@ void MyFrame::InitToolBar(wxToolBar* toolBar) // Define a constructor for my canvas MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size) - : wxScrolledWindow(parent, -1, pos, size, + : wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER | wxNO_FULL_REPAINT_ON_RESIZE | wxVSCROLL | wxHSCROLL) { SetBackgroundColour(wxColour(_T("WHITE"))); - m_dirty = FALSE; + m_dirty = false; } // Define the repainting behaviour @@ -401,7 +409,7 @@ void MyCanvas::OnEvent(wxMouseEvent& event) dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xpos, ypos, pt.x, pt.y); - m_dirty = TRUE; + m_dirty = true; } xpos = pt.x; @@ -412,11 +420,9 @@ void MyCanvas::OnEvent(wxMouseEvent& event) // MyChild // --------------------------------------------------------------------------- -MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, - const wxPoint& pos, const wxSize& size, - const long style) - : wxMDIChildFrame(parent, -1, title, pos, size, - style | wxNO_FULL_REPAINT_ON_RESIZE) +MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title) + : wxMDIChildFrame(parent, wxID_ANY, title, wxDefaultPosition, wxDefaultSize, + wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { canvas = (MyCanvas *) NULL; my_children.Append(this); @@ -432,7 +438,7 @@ MyChild::~MyChild() void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))