X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..0cdd04ad993f86710bc5c9d9c8c12ec25a34ac71:/samples/mdi/mdi.cpp diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index 2494bb8234..dbad766691 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -32,7 +32,8 @@ #include "wx/toolbar.h" #if !defined(__WXMSW__) - #include "mondrian.xpm" + #include "../sample.xpm" + #include "chart.xpm" #endif #include "bitmaps/new.xpm" @@ -72,7 +73,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) EVT_MENU(MDI_QUIT, MyFrame::OnQuit) EVT_CLOSE(MyFrame::OnClose) - EVT_SIZE(MyFrame::OnSize) END_EVENT_TABLE() @@ -86,6 +86,11 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition) EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize) +#if wxUSE_CLIPBOARD + EVT_MENU(wxID_PASTE, MyChild::OnPaste) + EVT_UPDATE_UI(wxID_PASTE, MyChild::OnUpdatePaste) +#endif // wxUSE_CLIPBOARD + EVT_SIZE(MyChild::OnSize) EVT_MOVE(MyChild::OnMove) @@ -109,24 +114,18 @@ 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 // Experimental: change the window menu wxMenu* windowMenu = new wxMenu; windowMenu->Append(5000, _T("My menu item!")); frame->SetWindowMenu(windowMenu); -#endif #endif // Give it an icon -#ifdef __WXMSW__ - frame->SetIcon(wxIcon(_T("mdi_icn"))); -#else - frame->SetIcon(wxIcon( mondrian_xpm )); -#endif + frame->SetIcon(wxICON(sample)); // Make a menubar wxMenu *file_menu = new wxMenu; @@ -145,13 +144,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; } // --------------------------------------------------------------------------- @@ -165,10 +166,9 @@ MyFrame::MyFrame(wxWindow *parent, const wxPoint& pos, const wxSize& size, const long style) - : wxMDIParentFrame(parent, id, title, pos, size, - style | wxNO_FULL_REPAINT_ON_RESIZE) + : wxMDIParentFrame(parent, id, title, pos, size, style) { - 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); @@ -177,6 +177,7 @@ MyFrame::MyFrame(wxWindow *parent, InitToolBar(GetToolBar()); #endif // wxUSE_TOOLBAR +#if wxUSE_ACCEL // Accelerators wxAcceleratorEntry entries[3]; entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW); @@ -184,6 +185,7 @@ MyFrame::MyFrame(wxWindow *parent, entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT); wxAcceleratorTable accel(3, entries); SetAcceleratorTable(accel); +#endif // wxUSE_ACCEL } void MyFrame::OnClose(wxCloseEvent& event) @@ -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); @@ -229,12 +229,9 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) subframe->SetTitle(title); // Give it an icon -#ifdef __WXMSW__ - subframe->SetIcon(wxIcon(_T("chrt_icn"))); -#else - subframe->SetIcon(wxIcon( mondrian_xpm )); -#endif + subframe->SetIcon(wxICON(chart)); +#if wxUSE_MENUS // Make a menubar wxMenu *file_menu = new wxMenu; @@ -249,6 +246,10 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) option_menu->AppendSeparator(); option_menu->Append(MDI_CHANGE_POSITION, _T("Move frame\tCtrl-M")); option_menu->Append(MDI_CHANGE_SIZE, _T("Resize frame\tCtrl-S")); +#if wxUSE_CLIPBOARD + option_menu->AppendSeparator(); + option_menu->Append(wxID_PASTE, _T("Copy text from clipboard\tCtrl-V")); +#endif // wxUSE_CLIPBOARD wxMenu *help_menu = new wxMenu; help_menu->Append(MDI_ABOUT, _T("&About")); @@ -261,9 +262,12 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) // Associate the menu bar with the frame subframe->SetMenuBar(menu_bar); +#endif // wxUSE_MENUS +#if wxUSE_STATUSBAR subframe->CreateStatusBar(); subframe->SetStatusText(title); +#endif // wxUSE_STATUSBAR int width, height; subframe->GetClientSize(&width, &height); @@ -274,10 +278,10 @@ 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& +void MyFrame::OnSize(wxSizeEvent& #ifdef __WXUNIVERSAL__ event #else @@ -294,7 +298,7 @@ void MyFrame::OnSize(wxSizeEvent& // FIXME: On wxX11, we need the MDI frame to process this // event, but on other platforms this should not // be done. -#ifdef __WXUNIVERSAL__ +#ifdef __WXUNIVERSAL__ event.Skip(); #endif } @@ -302,44 +306,30 @@ void MyFrame::OnSize(wxSizeEvent& #if wxUSE_TOOLBAR void MyFrame::InitToolBar(wxToolBar* toolBar) { - wxBitmap* bitmaps[8]; - - bitmaps[0] = new wxBitmap( new_xpm ); - bitmaps[1] = new wxBitmap( open_xpm ); - bitmaps[2] = new wxBitmap( save_xpm ); - bitmaps[3] = new wxBitmap( copy_xpm ); - bitmaps[4] = new wxBitmap( cut_xpm ); - bitmaps[5] = new wxBitmap( paste_xpm ); - bitmaps[6] = new wxBitmap( print_xpm ); - bitmaps[7] = new wxBitmap( help_xpm ); - - int width = 24; - int currentX = 5; - - toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("New file")); - currentX += width + 5; - toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Open file")); - currentX += width + 5; - toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Save file")); - currentX += width + 5; + wxBitmap bitmaps[8]; + + bitmaps[0] = wxBitmap( new_xpm ); + bitmaps[1] = wxBitmap( open_xpm ); + bitmaps[2] = wxBitmap( save_xpm ); + bitmaps[3] = wxBitmap( copy_xpm ); + bitmaps[4] = wxBitmap( cut_xpm ); + bitmaps[5] = wxBitmap( paste_xpm ); + bitmaps[6] = wxBitmap( print_xpm ); + bitmaps[7] = wxBitmap( help_xpm ); + + toolBar->AddTool(MDI_NEW_WINDOW, _T("New"), bitmaps[0], _T("New file")); + toolBar->AddTool(1, _T("Open"), bitmaps[1], _T("Open file")); + toolBar->AddTool(2, _T("Save"), bitmaps[2], _T("Save file")); toolBar->AddSeparator(); - toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Copy")); - currentX += width + 5; - toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Cut")); - currentX += width + 5; - toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Paste")); - currentX += width + 5; + toolBar->AddTool(3, _T("Copy"), bitmaps[3], _T("Copy")); + toolBar->AddTool(4, _T("Cut"), bitmaps[4], _T("Cut")); + toolBar->AddTool(5, _T("Paste"), bitmaps[5], _T("Paste")); toolBar->AddSeparator(); - toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Print")); - currentX += width + 5; + toolBar->AddTool(6, _T("Print"), bitmaps[6], _T("Print")); toolBar->AddSeparator(); - toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, _T("Help")); + toolBar->AddTool(MDI_ABOUT, _T("About"), bitmaps[7], _T("Help")); toolBar->Realize(); - - int i; - for (i = 0; i < 8; i++) - delete bitmaps[i]; } #endif // wxUSE_TOOLBAR @@ -349,19 +339,22 @@ 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 void MyCanvas::OnDraw(wxDC& dc) { + if ( !m_text.empty() ) + dc.DrawText(m_text, 10, 10); + dc.SetFont(*wxSWISS_FONT); dc.SetPen(*wxGREEN_PEN); dc.DrawLine(0, 0, 200, 200); @@ -401,7 +394,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 +405,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 +423,7 @@ MyChild::~MyChild() void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event)) @@ -453,7 +444,7 @@ void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event)) void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event)) { -//#if wxUSE_TEXTDLG +#if wxUSE_TEXTDLG static wxString s_title = _T("Canvas Frame"); wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"), @@ -465,7 +456,7 @@ void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event)) s_title = title; SetTitle(s_title); -//#endif +#endif // wxUSE_TEXTDLG } void MyChild::OnActivate(wxActivateEvent& event) @@ -519,4 +510,22 @@ void MyChild::OnClose(wxCloseEvent& event) event.Skip(); } +#if wxUSE_CLIPBOARD + +#include "wx/clipbrd.h" + +void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + wxClipboardLocker lock; + wxTextDataObject data; + canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText().c_str() + : _T("No text on clipboard")); +} + +void MyChild::OnUpdatePaste(wxUpdateUIEvent& event) +{ + wxClipboardLocker lock; + event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) ); +} +#endif // wxUSE_CLIPBOARD