X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d04d32c4ec397b1b036d86aa3a679ed7ef7c68dc..4e15d1caa03346c126015019c1fdf093033ef40b:/samples/mdi/mdi.cpp?ds=sidebyside diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp index 3721a03308..e68364cf01 100644 --- a/samples/mdi/mdi.cpp +++ b/samples/mdi/mdi.cpp @@ -2,11 +2,12 @@ // Name: mdi.cpp // Purpose: MDI sample // Author: Julian Smart -// Modified by: +// Modified by: 2008-10-31 Vadim Zeitlin: big clean up // Created: 04/01/98 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Copyright: (c) 1997 Julian Smart +// (c) 2008 Vadim Zeitlin +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -31,8 +32,9 @@ #include "wx/toolbar.h" -#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__) - #include "mondrian.xpm" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../sample.xpm" + #include "chart.xpm" #endif #include "bitmaps/new.xpm" @@ -44,58 +46,63 @@ #include "bitmaps/print.xpm" #include "bitmaps/help.xpm" +// replace this 0 with 1 to build the sample using the generic MDI classes (you +// may also need to add src/generic/mdig.cpp to the build) +#if 0 + #include "wx/generic/mdig.h" + #define wxMDIParentFrame wxGenericMDIParentFrame + #define wxMDIChildFrame wxGenericMDIChildFrame + #define wxMDIClientWindow wxGenericMDIClientWindow +#endif #include "mdi.h" IMPLEMENT_APP(MyApp) -// --------------------------------------------------------------------------- -// global variables -// --------------------------------------------------------------------------- - -MyFrame *frame = (MyFrame *) NULL; -wxList my_children; - -// For drawing lines in a canvas -static long xpos = -1; -static long ypos = -1; - -static int gs_nFrames = 0; - // --------------------------------------------------------------------------- // event tables // --------------------------------------------------------------------------- BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame) - EVT_MENU(MDI_ABOUT, MyFrame::OnAbout) - EVT_MENU(MDI_NEW_WINDOW, MyFrame::OnNewWindow) - EVT_MENU(MDI_QUIT, MyFrame::OnQuit) + EVT_MENU(wxID_ABOUT, MyFrame::OnAbout) + EVT_MENU(wxID_NEW, MyFrame::OnNewWindow) + EVT_MENU(MDI_FULLSCREEN, MyFrame::OnFullScreen) + EVT_MENU(wxID_EXIT, MyFrame::OnQuit) - EVT_CLOSE(MyFrame::OnClose) + EVT_MENU(wxID_CLOSE_ALL, MyFrame::OnCloseAll) - EVT_SIZE(MyFrame::OnSize) + EVT_CLOSE(MyFrame::OnClose) END_EVENT_TABLE() -// Note that MDI_NEW_WINDOW and MDI_ABOUT commands get passed +// Note that wxID_NEW and wxID_ABOUT commands get passed // to the parent window for processing, so no need to // duplicate event handlers here. BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame) - EVT_MENU(MDI_CHILD_QUIT, MyChild::OnQuit) + EVT_MENU(wxID_CLOSE, MyChild::OnClose) EVT_MENU(MDI_REFRESH, MyChild::OnRefresh) EVT_MENU(MDI_CHANGE_TITLE, MyChild::OnChangeTitle) 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) - EVT_CLOSE(MyChild::OnClose) + EVT_CLOSE(MyChild::OnCloseWindow) END_EVENT_TABLE() BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_MOUSE_EVENTS(MyCanvas::OnEvent) END_EVENT_TABLE() +BEGIN_EVENT_TABLE(MyChild::EventHandler, wxEvtHandler) + EVT_MENU(MDI_REFRESH, MyChild::EventHandler::OnRefresh) +END_EVENT_TABLE() + // =========================================================================== // implementation // =========================================================================== @@ -107,89 +114,126 @@ END_EVENT_TABLE() // Initialise this in OnInit, not statically bool MyApp::OnInit() { - // Create the main frame window + if ( !wxApp::OnInit() ) + return false; - frame = new MyFrame((wxFrame *)NULL, -1, "MDI Demo", - wxPoint(-1, -1), wxSize(500, 400), - wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL); -#ifdef __WXMSW__ -#if 0 - // Experimental: change the window menu - wxMenu* windowMenu = new wxMenu; - windowMenu->Append(5000, "My menu item!"); - frame->SetWindowMenu(windowMenu); -#endif -#endif - - // Give it an icon -#ifdef __WXMSW__ - frame->SetIcon(wxIcon("mdi_icn")); -#else - frame->SetIcon(wxIcon( mondrian_xpm )); -#endif + // Create the main frame window - // Make a menubar - wxMenu *file_menu = new wxMenu; + MyFrame *frame = new MyFrame; - file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N", "Create a new child window"); - file_menu->Append(MDI_QUIT, "&Exit\tAlt-X", "Quit the program"); + frame->Show(true); - wxMenu *help_menu = new wxMenu; - help_menu->Append(MDI_ABOUT, "&About\tF1"); + return true; +} - wxMenuBar *menu_bar = new wxMenuBar; +// --------------------------------------------------------------------------- +// MyFrame +// --------------------------------------------------------------------------- - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(help_menu, "&Help"); +// Define my frame constructor +MyFrame::MyFrame() + : wxMDIParentFrame(NULL, wxID_ANY, "wxWidgets MDI Sample", + wxDefaultPosition, wxSize(500, 400)) +{ + SetIcon(wxICON(sample)); + // Make a menubar +#if wxUSE_MENUS // Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + SetMenuBar(CreateMainMenubar()); - frame->CreateStatusBar(); - frame->Show(TRUE); + // This shows that the standard window menu may be customized: + wxMenu * const windowMenu = GetWindowMenu(); + if ( windowMenu ) + { + // we can change the labels of standard items (which also means we can + // set up accelerators for them as they're part of the label) + windowMenu->SetLabel(wxID_MDI_WINDOW_TILE_HORZ, + "&Tile horizontally\tCtrl-Shift-H"); + windowMenu->SetLabel(wxID_MDI_WINDOW_TILE_VERT, + "&Tile vertically\tCtrl-Shift-V"); + + // we can also change the help string + windowMenu->SetHelpString(wxID_MDI_WINDOW_CASCADE, + "Arrange windows in cascade"); + + // we can remove some items + windowMenu->Delete(wxID_MDI_WINDOW_ARRANGE_ICONS); + + // and we can add completely custom commands -- but then we must handle + // them ourselves, see OnCloseAll() + windowMenu->AppendSeparator(); + windowMenu->Append(wxID_CLOSE_ALL, "&Close all windows\tCtrl-Shift-C", + "Close all open windows"); + + SetWindowMenu(windowMenu); + } +#endif // wxUSE_MENUS - SetTopWindow(frame); +#if wxUSE_STATUSBAR + CreateStatusBar(); +#endif // wxUSE_STATUSBAR - return TRUE; -} -// --------------------------------------------------------------------------- -// MyFrame -// --------------------------------------------------------------------------- - -// Define my frame constructor -MyFrame::MyFrame(wxWindow *parent, - const wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const long style) - : wxMDIParentFrame(parent, id, title, pos, size, - style | wxNO_FULL_REPAINT_ON_RESIZE) -{ - textWindow = new wxTextCtrl(this, -1, "A help window", - wxDefaultPosition, wxDefaultSize, - wxTE_MULTILINE | wxSUNKEN_BORDER); + m_textWindow = new wxTextCtrl(this, wxID_ANY, "A help window", + wxDefaultPosition, wxDefaultSize, + wxTE_MULTILINE | wxSUNKEN_BORDER); +#if wxUSE_TOOLBAR CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL); InitToolBar(GetToolBar()); +#endif // wxUSE_TOOLBAR +#if wxUSE_ACCEL // Accelerators wxAcceleratorEntry entries[3]; - entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW); - entries[1].Set(wxACCEL_CTRL, (int) 'X', MDI_QUIT); - entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT); + entries[0].Set(wxACCEL_CTRL, (int) 'N', wxID_NEW); + entries[1].Set(wxACCEL_CTRL, (int) 'X', wxID_EXIT); + entries[2].Set(wxACCEL_CTRL, (int) 'A', wxID_ABOUT); wxAcceleratorTable accel(3, entries); SetAcceleratorTable(accel); +#endif // wxUSE_ACCEL + + // connect it only now, after creating m_textWindow + Connect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize)); } +MyFrame::~MyFrame() +{ + // and disconnect it to prevent accessing already deleted m_textWindow in + // the size event handler if it's called during destruction + Disconnect(wxEVT_SIZE, wxSizeEventHandler(MyFrame::OnSize)); +} + +#if wxUSE_MENUS +/* static */ +wxMenuBar *MyFrame::CreateMainMenubar() +{ + wxMenu *menuFile = new wxMenu; + + menuFile->Append(wxID_NEW, "&New window\tCtrl-N", "Create a new child window"); + menuFile->AppendCheckItem(MDI_FULLSCREEN, "Show &full screen\tCtrl-F"); + menuFile->Append(wxID_EXIT, "&Exit\tAlt-X", "Quit the program"); + + wxMenu *menuHelp = new wxMenu; + menuHelp->Append(wxID_ABOUT, "&About\tF1"); + + wxMenuBar *mbar = new wxMenuBar; + mbar->Append(menuFile, "&File"); + mbar->Append(menuHelp, "&Help"); + + return mbar; +} +#endif // wxUSE_MENUS + void MyFrame::OnClose(wxCloseEvent& event) { - if ( event.CanVeto() && (gs_nFrames > 0) ) + unsigned numChildren = MyChild::GetChildrenCount(); + if ( event.CanVeto() && (numChildren > 0) ) { wxString msg; - msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames); + msg.Printf("%d windows still open, close anyhow?", numChildren); if ( wxMessageBox(msg, "Please confirm", wxICON_QUESTION | wxYES_NO) != wxYES ) { @@ -209,122 +253,81 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { - (void)wxMessageBox("wxWindows 2.0 MDI Demo\n" + (void)wxMessageBox("wxWidgets 2.0 MDI Demo\n" "Author: Julian Smart (c) 1997\n" "Usage: mdi.exe", "About MDI Demo"); } void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) { - // Make another frame, containing a canvas - MyChild *subframe = new MyChild(frame, "Canvas Frame", - wxPoint(-1, -1), wxSize(-1, -1), - wxDEFAULT_FRAME_STYLE); - - wxString title; - title.Printf(_T("Canvas Frame %d"), ++gs_nFrames); - - subframe->SetTitle(title); - - // Give it an icon -#ifdef __WXMSW__ - subframe->SetIcon(wxIcon("chrt_icn")); -#else - subframe->SetIcon(wxIcon( mondrian_xpm )); -#endif - - // Make a menubar - wxMenu *file_menu = new wxMenu; - - file_menu->Append(MDI_NEW_WINDOW, "&New window"); - file_menu->Append(MDI_CHILD_QUIT, "&Close child", "Close this window"); - file_menu->Append(MDI_QUIT, "&Exit"); - - wxMenu *option_menu = new wxMenu; - - option_menu->Append(MDI_REFRESH, "&Refresh picture"); - option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T"); - option_menu->AppendSeparator(); - option_menu->Append(MDI_CHANGE_POSITION, "Move frame\tCtrl-M"); - option_menu->Append(MDI_CHANGE_SIZE, "Resize frame\tCtrl-S"); - - wxMenu *help_menu = new wxMenu; - help_menu->Append(MDI_ABOUT, "&About"); - - wxMenuBar *menu_bar = new wxMenuBar; - - menu_bar->Append(file_menu, "&File"); - menu_bar->Append(option_menu, "&Child"); - menu_bar->Append(help_menu, "&Help"); - - // Associate the menu bar with the frame - subframe->SetMenuBar(menu_bar); - - subframe->CreateStatusBar(); - subframe->SetStatusText(title); - - int width, height; - subframe->GetClientSize(&width, &height); - MyCanvas *canvas = new MyCanvas(subframe, wxPoint(0, 0), wxSize(width, height)); - canvas->SetCursor(wxCursor(wxCURSOR_PENCIL)); - subframe->canvas = canvas; + // create and show another child frame + MyChild *subframe = new MyChild(this); + subframe->Show(true); +} - // Give it scrollbars - canvas->SetScrollbars(20, 20, 50, 50); +void MyFrame::OnFullScreen(wxCommandEvent& event) +{ + ShowFullScreen(event.IsChecked()); +} - subframe->Show(TRUE); +void MyFrame::OnCloseAll(wxCommandEvent& WXUNUSED(event)) +{ + for ( wxWindowList::const_iterator i = GetChildren().begin(); + i != GetChildren().end(); + ++i ) + { + if ( wxDynamicCast(*i, wxMDIChildFrame) ) + (*i)->Close(); + } } -void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event)) +void MyFrame::OnSize(wxSizeEvent& event) { int w, h; GetClientSize(&w, &h); - textWindow->SetSize(0, 0, 200, h); + m_textWindow->SetSize(0, 0, 200, h); GetClientWindow()->SetSize(200, 0, w - 200, h); + + // FIXME: On wxX11, we need the MDI frame to process this + // event, but on other platforms this should not + // be done. +#ifdef __WXUNIVERSAL__ + event.Skip(); +#else + wxUnusedVar(event); +#endif } +#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, "New file"); - currentX += width + 5; - toolBar->AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Open file"); - currentX += width + 5; - toolBar->AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "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(wxID_NEW, "New", bitmaps[0], "New file"); + toolBar->AddTool(1, "Open", bitmaps[1], "Open file"); + toolBar->AddTool(2, "Save", bitmaps[2], "Save file"); toolBar->AddSeparator(); - toolBar->AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Copy"); - currentX += width + 5; - toolBar->AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Cut"); - currentX += width + 5; - toolBar->AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Paste"); - currentX += width + 5; + toolBar->AddTool(3, "Copy", bitmaps[3], "Copy"); + toolBar->AddTool(4, "Cut", bitmaps[4], "Cut"); + toolBar->AddTool(5, "Paste", bitmaps[5], "Paste"); toolBar->AddSeparator(); - toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print"); - currentX += width + 5; + toolBar->AddTool(6, "Print", bitmaps[6], "Print"); toolBar->AddSeparator(); - toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help"); + toolBar->AddTool(wxID_ABOUT, "About", bitmaps[7], "Help"); toolBar->Realize(); - - int i; - for (i = 0; i < 8; i++) - delete bitmaps[i]; } +#endif // wxUSE_TOOLBAR // --------------------------------------------------------------------------- // MyCanvas @@ -332,19 +335,25 @@ 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("WHITE")); + SetCursor(wxCursor(wxCURSOR_PENCIL)); + + SetScrollbars(20, 20, 50, 50); - 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); @@ -379,12 +388,15 @@ void MyCanvas::OnEvent(wxMouseEvent& event) wxPoint pt(event.GetLogicalPosition(dc)); + static long xpos = -1; + static long ypos = -1; + if (xpos > -1 && ypos > -1 && event.Dragging()) { dc.SetPen(*wxBLACK_PEN); dc.DrawLine(xpos, ypos, pt.x, pt.y); - m_dirty = TRUE; + m_dirty = true; } xpos = pt.x; @@ -395,33 +407,76 @@ 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) +unsigned MyChild::ms_numChildren = 0; + +MyChild::MyChild(wxMDIParentFrame *parent) + : wxMDIChildFrame + ( + parent, + wxID_ANY, + wxString::Format("Child %u", ++ms_numChildren) + ) { - canvas = (MyCanvas *) NULL; - my_children.Append(this); + m_canvas = new MyCanvas(this, wxPoint(0, 0), GetClientSize()); + + SetIcon(wxICON(chart)); + + const bool canBeResized = !IsAlwaysMaximized(); + + // create our menu bar: it will be shown instead of the main frame one when + // we're active +#if wxUSE_MENUS + wxMenuBar *mbar = MyFrame::CreateMainMenubar(); + mbar->GetMenu(0)->Insert(1, wxID_CLOSE, "&Close child\tCtrl-W", + "Close this window"); + + wxMenu *menuChild = new wxMenu; + + menuChild->Append(MDI_REFRESH, "&Refresh picture"); + menuChild->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T"); + if ( canBeResized ) + { + menuChild->AppendSeparator(); + menuChild->Append(MDI_CHANGE_POSITION, "Move frame\tCtrl-M"); + menuChild->Append(MDI_CHANGE_SIZE, "Resize frame\tCtrl-S"); + } +#if wxUSE_CLIPBOARD + menuChild->AppendSeparator(); + menuChild->Append(wxID_PASTE, "Copy text from clipboard\tCtrl-V"); +#endif // wxUSE_CLIPBOARD + + mbar->Insert(1, menuChild, "&Child"); - // this should work for MDI frames as well as for normal ones - SetSizeHints(100, 100); + // Associate the menu bar with the frame + SetMenuBar(mbar); +#endif // wxUSE_MENUS + + // this should work for MDI frames as well as for normal ones, provided + // they can be resized at all + if ( canBeResized ) + SetSizeHints(100, 100); + + // test that event handlers pushed on top of MDI children do work (this + // used to be broken, see #11225) + PushEventHandler(new EventHandler(ms_numChildren)); } MyChild::~MyChild() { - my_children.DeleteObject(this); + PopEventHandler(true); + + ms_numChildren--; } -void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event)) +void MyChild::OnClose(wxCommandEvent& WXUNUSED(event)) { - Close(TRUE); + Close(true); } void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event)) { - if ( canvas ) - canvas->Refresh(); + if ( m_canvas ) + m_canvas->Refresh(); } void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event)) @@ -436,10 +491,11 @@ void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event)) void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event)) { - static wxString s_title = _T("Canvas Frame"); +#if wxUSE_TEXTDLG + static wxString s_title = "Canvas Frame"; - wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"), - _T("MDI sample question"), + wxString title = wxGetTextFromUser("Enter the new title for MDI child", + "MDI sample question", s_title, GetParent()->GetParent()); if ( !title ) @@ -447,12 +503,13 @@ void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event)) s_title = title; SetTitle(s_title); +#endif // wxUSE_TEXTDLG } void MyChild::OnActivate(wxActivateEvent& event) { - if ( event.GetActive() && canvas ) - canvas->SetFocus(); + if ( event.GetActive() && m_canvas ) + m_canvas->SetFocus(); } void MyChild::OnMove(wxMoveEvent& event) @@ -462,7 +519,7 @@ void MyChild::OnMove(wxMoveEvent& event) // to be the width of the MDI canvas border) wxPoint pos1 = event.GetPosition(), pos2 = GetPosition(); - wxLogStatus(wxT("position from event: (%d, %d), from frame (%d, %d)"), + wxLogStatus("position from event: (%d, %d), from frame (%d, %d)", pos1.x, pos1.y, pos2.x, pos2.y); event.Skip(); @@ -476,15 +533,15 @@ void MyChild::OnSize(wxSizeEvent& event) wxSize size1 = event.GetSize(), size2 = GetSize(), size3 = GetClientSize(); - wxLogStatus(wxT("size from event: %dx%d, from frame %dx%d, client %dx%d"), + wxLogStatus("size from event: %dx%d, from frame %dx%d, client %dx%d", size1.x, size1.y, size2.x, size2.y, size3.x, size3.y); event.Skip(); } -void MyChild::OnClose(wxCloseEvent& event) +void MyChild::OnCloseWindow(wxCloseEvent& event) { - if ( canvas && canvas->IsDirty() ) + if ( m_canvas && m_canvas->IsDirty() ) { if ( wxMessageBox("Really close?", "Please confirm", wxICON_QUESTION | wxYES_NO) != wxYES ) @@ -495,9 +552,26 @@ void MyChild::OnClose(wxCloseEvent& event) } } - gs_nFrames--; - event.Skip(); } +#if wxUSE_CLIPBOARD + +#include "wx/clipbrd.h" + +void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event)) +{ + wxClipboardLocker lock; + wxTextDataObject data; + m_canvas->SetText(wxTheClipboard->GetData(data) + ? data.GetText() + : wxString("No text on clipboard")); +} + +void MyChild::OnUpdatePaste(wxUpdateUIEvent& event) +{ + wxClipboardLocker lock; + event.Enable( wxTheClipboard->IsSupported(wxDF_TEXT) ); +} +#endif // wxUSE_CLIPBOARD