added support for drop down toolbar buttons (patch 1713470)

[wxWidgets.git] / samples / mdi / mdi.cpp

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 60da58b8d7d5895d1503b754e31bab0b842d71ea..18e040016398e2446180fd831470430d8baa030e 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,11 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -34,20 +29,23 @@
     #include "wx/mdi.h"
 #endif
 
     #include "wx/mdi.h"
 #endif
 

-#include <wx/toolbar.h>
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #include "mondrian.xpm"
-    #include "bitmaps/new.xpm"
-    #include "bitmaps/open.xpm"
-    #include "bitmaps/save.xpm"
-    #include "bitmaps/copy.xpm"
-    #include "bitmaps/cut.xpm"
-    #include "bitmaps/paste.xpm"
-    #include "bitmaps/print.xpm"
-    #include "bitmaps/help.xpm"
+#include "wx/toolbar.h"
+
+#if !defined(__WXMSW__)
+    #include "../sample.xpm"
+    #include "chart.xpm"

 #endif
 
 #endif
 

+#include "bitmaps/new.xpm"
+#include "bitmaps/open.xpm"
+#include "bitmaps/save.xpm"
+#include "bitmaps/copy.xpm"
+#include "bitmaps/cut.xpm"
+#include "bitmaps/paste.xpm"
+#include "bitmaps/print.xpm"
+#include "bitmaps/help.xpm"
+
+

 #include "mdi.h"
 
 IMPLEMENT_APP(MyApp)
 #include "mdi.h"
 
 IMPLEMENT_APP(MyApp)


@@ -75,7 +73,6 @@ BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
     EVT_MENU(MDI_QUIT, MyFrame::OnQuit)
 
     EVT_CLOSE(MyFrame::OnClose)
     EVT_MENU(MDI_QUIT, MyFrame::OnQuit)
 
     EVT_CLOSE(MyFrame::OnClose)

-

     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 
     EVT_SIZE(MyFrame::OnSize)
 END_EVENT_TABLE()
 


@@ -89,7 +86,10 @@ BEGIN_EVENT_TABLE(MyChild, wxMDIChildFrame)
     EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition)
     EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize)
 
     EVT_MENU(MDI_CHANGE_POSITION, MyChild::OnChangePosition)
     EVT_MENU(MDI_CHANGE_SIZE, MyChild::OnChangeSize)
 

-    EVT_UPDATE_UI(MDI_REFRESH, MyChild::OnUpdateRefresh)
+#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_SIZE(MyChild::OnSize)
     EVT_MOVE(MyChild::OnMove)


@@ -112,51 +112,50 @@ END_EVENT_TABLE()
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {
 // Initialise this in OnInit, not statically
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // Create the main frame window
 
     // Create the main frame window
 

-    frame = new MyFrame((wxFrame *)NULL, -1, "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);
                         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

-#ifdef __WXMSW__

 #if 0
     // Experimental: change the window menu
     wxMenu* windowMenu = new wxMenu;
 #if 0
     // Experimental: change the window menu
     wxMenu* windowMenu = new wxMenu;

-    windowMenu->Append(5000, "My menu item!");
+    windowMenu->Append(5000, _T("My menu item!"));

     frame->SetWindowMenu(windowMenu);
     frame->SetWindowMenu(windowMenu);

-#endif

 #endif
 
     // Give it an icon
 #endif
 
     // Give it an icon

-#ifdef __WXMSW__
-    frame->SetIcon(wxIcon("mdi_icn"));
-#else
-    frame->SetIcon(wxIcon( mondrian_xpm ));
-#endif
+    frame->SetIcon(wxICON(sample));

 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    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");
+    file_menu->Append(MDI_NEW_WINDOW, _T("&New window\tCtrl-N"), _T("Create a new child window"));
+    file_menu->Append(MDI_QUIT, _T("&Exit\tAlt-X"), _T("Quit the program"));

 
     wxMenu *help_menu = new wxMenu;
 
     wxMenu *help_menu = new wxMenu;

-    help_menu->Append(MDI_ABOUT, "&About\tF1");
+    help_menu->Append(MDI_ABOUT, _T("&About\tF1"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
 
     wxMenuBar *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);
 
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
 

-    frame->Show(TRUE);
+    frame->Show(true);

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -172,13 +171,16 @@ MyFrame::MyFrame(wxWindow *parent,
                  const long style)
        : wxMDIParentFrame(parent, id, title, pos, size, style)
 {
                  const long style)
        : wxMDIParentFrame(parent, id, title, pos, size, style)
 {

-    textWindow = new wxTextCtrl(this, -1, "A help window",
+    textWindow = new wxTextCtrl(this, wxID_ANY, _T("A help window"),

                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 wxTE_MULTILINE | wxSUNKEN_BORDER);
 

-    CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL);
+#if wxUSE_TOOLBAR
+    CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);

     InitToolBar(GetToolBar());
     InitToolBar(GetToolBar());

+#endif // wxUSE_TOOLBAR

 
 

+#if wxUSE_ACCEL

     // Accelerators
     wxAcceleratorEntry entries[3];
     entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);
     // Accelerators
     wxAcceleratorEntry entries[3];
     entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);


@@ -186,6 +188,7 @@ MyFrame::MyFrame(wxWindow *parent,
     entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
     wxAcceleratorTable accel(3, entries);
     SetAcceleratorTable(accel);
     entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
     wxAcceleratorTable accel(3, entries);
     SetAcceleratorTable(accel);

+#endif // wxUSE_ACCEL

 }
 
 void MyFrame::OnClose(wxCloseEvent& event)
 }
 
 void MyFrame::OnClose(wxCloseEvent& event)


@@ -194,7 +197,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
     {
         wxString msg;
         msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames);
     {
         wxString msg;
         msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames);

-        if ( wxMessageBox(msg, "Please confirm",
+        if ( wxMessageBox(msg, _T("Please confirm"),

                           wxICON_QUESTION | wxYES_NO) != wxYES )
         {
             event.Veto();
                           wxICON_QUESTION | wxYES_NO) != wxYES )
         {
             event.Veto();


@@ -213,17 +216,15 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-    (void)wxMessageBox("wxWindows 2.0 MDI Demo\n"
-                       "Author: Julian Smart (c) 1997\n"
-                       "Usage: mdi.exe", "About MDI Demo");
+    (void)wxMessageBox(_T("wxWidgets 2.0 MDI Demo\n")
+                       _T("Author: Julian Smart (c) 1997\n")
+                       _T("Usage: mdi.exe"), _T("About MDI Demo"));

 }
 
 void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 {
     // Make another frame, containing a canvas
 }
 
 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);
+    MyChild *subframe = new MyChild(frame, _T("Canvas Frame"));

 
     wxString title;
     title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);
 
     wxString title;
     title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);


@@ -231,38 +232,45 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->SetTitle(title);
 
     // Give it an icon
     subframe->SetTitle(title);
 
     // Give it an icon

-#ifdef __WXMSW__
-    subframe->SetIcon(wxIcon("chrt_icn"));
-#else
-    subframe->SetIcon(wxIcon( mondrian_xpm ));
-#endif
+    subframe->SetIcon(wxICON(chart));

 
 

+#if wxUSE_MENUS

     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
 

-    file_menu->Append(MDI_NEW_WINDOW, "&New window\tCtrl-N");
-    file_menu->Append(MDI_CHILD_QUIT, "&Close child", "Close this window");
-    file_menu->Append(MDI_QUIT, "&Exit\tAlt-X");
+    file_menu->Append(MDI_NEW_WINDOW, _T("&New window"));
+    file_menu->Append(MDI_CHILD_QUIT, _T("&Close child"), _T("Close this window"));
+    file_menu->Append(MDI_QUIT, _T("&Exit"));

 
     wxMenu *option_menu = new wxMenu;
 
 
     wxMenu *option_menu = new wxMenu;
 

-    option_menu->Append(MDI_REFRESH, "&Refresh picture\tF5");
-    option_menu->Append(MDI_CHANGE_TITLE, "Change &title...\tCtrl-T");
+    option_menu->Append(MDI_REFRESH, _T("&Refresh picture"));
+    option_menu->Append(MDI_CHANGE_TITLE, _T("Change &title...\tCtrl-T"));
+    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;
 
     wxMenu *help_menu = new wxMenu;

-    help_menu->Append(MDI_ABOUT, "&About\tF1");
+    help_menu->Append(MDI_ABOUT, _T("&About"));

 
     wxMenuBar *menu_bar = new wxMenuBar;
 
 
     wxMenuBar *menu_bar = new wxMenuBar;
 

-    menu_bar->Append(file_menu, "&File");
-    menu_bar->Append(option_menu, "&Options");
-    menu_bar->Append(help_menu, "&Help");
+    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(option_menu, _T("&Child"));
+    menu_bar->Append(help_menu, _T("&Help"));

 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);

+#endif // wxUSE_MENUS

 
 

+#if wxUSE_STATUSBAR

     subframe->CreateStatusBar();
     subframe->SetStatusText(title);
     subframe->CreateStatusBar();
     subframe->SetStatusText(title);

+#endif // wxUSE_STATUSBAR

 
     int width, height;
     subframe->GetClientSize(&width, &height);
 
     int width, height;
     subframe->GetClientSize(&width, &height);


@@ -273,74 +281,60 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
 
     // Give it scrollbars
     canvas->SetScrollbars(20, 20, 50, 50);
 

-    subframe->Show(TRUE);
+    subframe->Show(true);

 }
 
 }
 

-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+void MyFrame::OnSize(wxSizeEvent&
+                                  #ifdef __WXUNIVERSAL__
+                                  event
+                                  #else
+                                  WXUNUSED(event)
+                                  #endif
+                                  )

 {
     int w, h;
     GetClientSize(&w, &h);
 
     textWindow->SetSize(0, 0, 200, h);
     GetClientWindow()->SetSize(200, 0, w - 200, h);
 {
     int w, h;
     GetClientSize(&w, &h);
 
     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();
+#endif

 }
 
 }
 

+#if wxUSE_TOOLBAR

 void MyFrame::InitToolBar(wxToolBar* toolBar)
 {
 void MyFrame::InitToolBar(wxToolBar* toolBar)
 {

-    wxBitmap* bitmaps[8];
-
-#ifdef __WXMSW__
-    bitmaps[0] = new wxBitmap("icon1", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[1] = new wxBitmap("icon2", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[2] = new wxBitmap("icon3", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[3] = new wxBitmap("icon4", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[4] = new wxBitmap("icon5", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[5] = new wxBitmap("icon6", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
-    bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
-#else
-    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 );
-#endif
-
-#ifdef __WXMSW__
-    int width = 24;
-#else
-    int width = 16;
-#endif
-    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(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->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, _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->AddSeparator();

-    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, "Print");
-    currentX += width + 5;
+    toolBar->AddTool(6, _T("Print"), bitmaps[6], _T("Print"));

     toolBar->AddSeparator();
     toolBar->AddSeparator();

-    toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, "Help");
+    toolBar->AddTool(MDI_ABOUT, _T("About"), bitmaps[7], _T("Help"));

 
     toolBar->Realize();
 
     toolBar->Realize();

-
-    int i;
-    for (i = 0; i < 8; i++)
-        delete bitmaps[i];

 }
 }

+#endif // wxUSE_TOOLBAR

 
 // ---------------------------------------------------------------------------
 // MyCanvas
 
 // ---------------------------------------------------------------------------
 // MyCanvas


@@ -348,17 +342,22 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)

-        : wxScrolledWindow(parent, -1, pos, size,
-                           wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
+        : wxScrolledWindow(parent, wxID_ANY, pos, size,
+                           wxSUNKEN_BORDER |
+                           wxNO_FULL_REPAINT_ON_RESIZE |
+                           wxVSCROLL | wxHSCROLL)

 {
 {

-    SetBackgroundColour(wxColour("WHITE"));
+    SetBackgroundColour(wxColour(_T("WHITE")));

 
 

-    m_dirty = FALSE;
+    m_dirty = false;

 }
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
 }
 
 // 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);
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
     dc.DrawLine(0, 0, 200, 200);


@@ -374,7 +373,7 @@ void MyCanvas::OnDraw(wxDC& dc)
     dc.DrawSpline(50, 200, 50, 100, 200, 10);
 #endif // wxUSE_SPLINES
     dc.DrawLine(50, 230, 200, 230);
     dc.DrawSpline(50, 200, 50, 100, 200, 10);
 #endif // wxUSE_SPLINES
     dc.DrawLine(50, 230, 200, 230);

-    dc.DrawText("This is a test string", 50, 230);
+    dc.DrawText(_T("This is a test string"), 50, 230);

 
     wxPoint points[3];
     points[0].x = 200; points[0].y = 300;
 
     wxPoint points[3];
     points[0].x = 200; points[0].y = 300;


@@ -398,7 +397,7 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
         dc.SetPen(*wxBLACK_PEN);
         dc.DrawLine(xpos, ypos, pt.x, pt.y);
 
         dc.SetPen(*wxBLACK_PEN);
         dc.DrawLine(xpos, ypos, pt.x, pt.y);
 

-        m_dirty = TRUE;
+        m_dirty = true;

     }
 
     xpos = pt.x;
     }
 
     xpos = pt.x;


@@ -409,13 +408,15 @@ void MyCanvas::OnEvent(wxMouseEvent& event)
 // MyChild
 // ---------------------------------------------------------------------------
 
 // MyChild
 // ---------------------------------------------------------------------------
 

-MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
-                 const wxPoint& pos, const wxSize& size,
-                 const long style)
-       : wxMDIChildFrame(parent, -1, title, pos, size, style)
+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);
 {
     canvas = (MyCanvas *) NULL;
     my_children.Append(this);

+
+    // this should work for MDI frames as well as for normal ones
+    SetSizeHints(100, 100);

 }
 
 MyChild::~MyChild()
 }
 
 MyChild::~MyChild()


@@ -425,12 +426,7 @@ MyChild::~MyChild()
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
-}
-
-void MyChild::OnUpdateRefresh(wxUpdateUIEvent& event)
-{
-    event.Enable( canvas && canvas->IsDirty() );
+    Close(true);

 }
 
 void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))


@@ -439,19 +435,31 @@ void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))
         canvas->Refresh();
 }
 
         canvas->Refresh();
 }
 

+void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event))
+{
+    Move(10, 10);
+}
+
+void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event))
+{
+    SetClientSize(100, 100);
+}
+

 void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {
 void MyChild::OnChangeTitle(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_TEXTDLG

     static wxString s_title = _T("Canvas Frame");
 
     wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
                                        _T("MDI sample question"),
                                        s_title,
     static wxString s_title = _T("Canvas Frame");
 
     wxString title = wxGetTextFromUser(_T("Enter the new title for MDI child"),
                                        _T("MDI sample question"),
                                        s_title,

-                                       GetParent());
+                                       GetParent()->GetParent());

     if ( !title )
         return;
 
     s_title = title;
     SetTitle(s_title);
     if ( !title )
         return;
 
     s_title = title;
     SetTitle(s_title);

+#endif // wxUSE_TEXTDLG

 }
 
 void MyChild::OnActivate(wxActivateEvent& event)
 }
 
 void MyChild::OnActivate(wxActivateEvent& event)


@@ -460,11 +468,38 @@ void MyChild::OnActivate(wxActivateEvent& event)
         canvas->SetFocus();
 }
 
         canvas->SetFocus();
 }
 

+void MyChild::OnMove(wxMoveEvent& event)
+{
+    // VZ: here everything is totally wrong under MSW, the positions are
+    //     different and both wrong (pos2 is off by 2 pixels for me which seems
+    //     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)"),
+                pos1.x, pos1.y, pos2.x, pos2.y);
+
+    event.Skip();
+}
+
+void MyChild::OnSize(wxSizeEvent& event)
+{
+    // VZ: under MSW the size event carries the client size (quite
+    //     unexpectedly) *except* for the very first one which has the full
+    //     size... what should it really be? TODO: check under wxGTK
+    wxSize size1 = event.GetSize(),
+           size2 = GetSize(),
+           size3 = GetClientSize();
+    wxLogStatus(wxT("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)
 {
     if ( canvas && canvas->IsDirty() )
     {
 void MyChild::OnClose(wxCloseEvent& event)
 {
     if ( canvas && canvas->IsDirty() )
     {

-        if ( wxMessageBox("Really close?", "Please confirm",
+        if ( wxMessageBox(_T("Really close?"), _T("Please confirm"),

                           wxICON_QUESTION | wxYES_NO) != wxYES )
         {
             event.Veto();
                           wxICON_QUESTION | wxYES_NO) != wxYES )
         {
             event.Veto();


@@ -478,4 +513,22 @@ void MyChild::OnClose(wxCloseEvent& event)
     event.Skip();
 }
 
     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