moved XML classes to the core

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

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 97b0a355ab48380ea28c19b72c972371d9770706..221fad9643a7845d689a5ce9e4958ca93a907528 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -5,397 +5,508 @@
 // 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
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// headers
+// ---------------------------------------------------------------------------
+

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
-#include "wx/mdi.h"
+    #include "wx/wx.h"
+    #include "wx/mdi.h"

 #endif
 
 #endif
 

-#ifdef __WXMSW__
-#ifdef __WIN95__
-#include <wx/tbar95.h>
-#else
-#include <wx/tbarmsw.h>
-#endif
+#include "wx/toolbar.h"
+
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+    #include "mondrian.xpm"

 #endif
 
 #endif
 

-#include "mdi.h"
+#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"

 
 

-MyFrame *frame = NULL;
-wxList my_children;
+
+#include "mdi.h"

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

+// ---------------------------------------------------------------------------
+// global variables
+// ---------------------------------------------------------------------------
+
+MyFrame *frame = (MyFrame *) NULL;
+wxList my_children;
+

 // For drawing lines in a canvas
 // For drawing lines in a canvas

-long xpos = -1;
-long ypos = -1;
+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_CLOSE(MyFrame::OnClose)
+
+    EVT_SIZE(MyFrame::OnSize)
+END_EVENT_TABLE()
+
+// Note that MDI_NEW_WINDOW and MDI_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(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)

 
 

-int winNumber = 1;
+    EVT_SIZE(MyChild::OnSize)
+    EVT_MOVE(MyChild::OnMove)
+
+    EVT_CLOSE(MyChild::OnClose)
+END_EVENT_TABLE()
+
+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+    EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
+END_EVENT_TABLE()
+
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// MyApp
+// ---------------------------------------------------------------------------

 
 // Initialise this in OnInit, not statically
 
 // Initialise this in OnInit, not statically

-bool MyApp::OnInit(void)
+bool MyApp::OnInit()

 {
 {

-  // Create the main frame window
+    // Create the main frame window

 
 

-  frame = new MyFrame(NULL, -1, "MDI Demo", wxPoint(0, 0), wxSize(500, 400),
-   wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
-
-  // Give it an icon (this is ignored in MDI mode: uses resources)
+    frame = new MyFrame((wxFrame *)NULL, -1, _T("MDI Demo"),
+                        wxPoint(-1, -1), wxSize(500, 400),
+                        wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-  frame->SetIcon(wxIcon("mdi_icn"));
+#if 0
+    // Experimental: change the window menu
+    wxMenu* windowMenu = new wxMenu;
+    windowMenu->Append(5000, _T("My menu item!"));
+    frame->SetWindowMenu(windowMenu);

 #endif
 #endif

-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));

 #endif
 
 #endif
 

-  // Make a menubar
-  wxMenu *file_menu = new wxMenu;
+    // Give it an icon
+#ifdef __WXMSW__
+    frame->SetIcon(wxIcon(_T("mdi_icn")));
+#else
+    frame->SetIcon(wxIcon( mondrian_xpm ));
+#endif

 
 

-  file_menu->Append(MDI_NEW_WINDOW, "&New window");
-  file_menu->Append(MDI_QUIT, "&Exit");
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-  wxMenu *help_menu = new wxMenu;
-  help_menu->Append(MDI_ABOUT, "&About");
+    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"));

 
 

-  wxMenuBar *menu_bar = new wxMenuBar;
+    wxMenu *help_menu = new wxMenu;
+    help_menu->Append(MDI_ABOUT, _T("&About\tF1"));

 
 

-  menu_bar->Append(file_menu, "&File");
-  menu_bar->Append(help_menu, "&Help");
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-  // Associate the menu bar with the frame
-  frame->SetMenuBar(menu_bar);
+    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(help_menu, _T("&Help"));

 
 

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

 
 

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

 
 

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

 
 

-  return TRUE;
+    SetTopWindow(frame);
+
+    return TRUE;

 }
 
 }
 

-BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
-    EVT_MENU(MDI_QUIT, MyFrame::OnQuit)
-    EVT_MENU(MDI_ABOUT, MyFrame::OnAbout)
-    EVT_MENU(MDI_NEW_WINDOW, MyFrame::OnNewWindow)
-    EVT_SIZE(MyFrame::OnSize)
-END_EVENT_TABLE()
+// ---------------------------------------------------------------------------
+// MyFrame
+// ---------------------------------------------------------------------------

 
 // Define my frame constructor
 
 // 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)
+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, "", wxDefaultPosition, wxDefaultSize,
-        wxTE_MULTILINE|wxSUNKEN_BORDER);
-    textWindow->SetValue("A help window");
+    textWindow = new wxTextCtrl(this, -1, _T("A help window"),
+                                wxDefaultPosition, wxDefaultSize,
+                                wxTE_MULTILINE | wxSUNKEN_BORDER);
+
+    CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
+    InitToolBar(GetToolBar());
+
+    // 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);
+    wxAcceleratorTable accel(3, entries);
+    SetAcceleratorTable(accel);
+}

 
 

-#ifdef __WXMSW__
-    toolBar = new TestRibbon(this, 0, 0, 100, 30, wxNO_BORDER, wxVERTICAL, 1);
-    SetToolBar(toolBar);
-#endif
+void MyFrame::OnClose(wxCloseEvent& event)
+{
+    if ( event.CanVeto() && (gs_nFrames > 0) )
+    {
+        wxString msg;
+        msg.Printf(_T("%d windows still open, close anyhow?"), gs_nFrames);
+        if ( wxMessageBox(msg, _T("Please confirm"),
+                          wxICON_QUESTION | wxYES_NO) != wxYES )
+        {
+            event.Veto();
+
+            return;
+        }
+    }
+
+    event.Skip();

 }
 
 }
 

-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))

 {
 {

-      Close(TRUE);
+    Close();

 }
 
 }
 

-void MyFrame::OnAbout(wxCommandEvent& event)
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )

 {
 {

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

 }
 
 }
 

-void MyFrame::OnNewWindow(wxCommandEvent& event)
+void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )

 {
 {

-      // Make another frame, containing a canvas
-      MyChild *subframe = new MyChild(frame, "Canvas Frame", wxPoint(10, 10), wxSize(300, 300),
-                             wxDEFAULT_FRAME);
+    // Make another frame, containing a canvas
+    MyChild *subframe = new MyChild(frame, _T("Canvas Frame"),
+                                    wxPoint(-1, -1), wxSize(-1, -1),
+                                    wxDEFAULT_FRAME_STYLE);

 
 

-      char titleBuf[100];
-      sprintf(titleBuf, "Canvas Frame %d", winNumber);
-      subframe->SetTitle(titleBuf);
-      winNumber ++;
+    wxString title;
+    title.Printf(_T("Canvas Frame %d"), ++gs_nFrames);

 
 

-      // Give it an icon (this is ignored in MDI mode: uses resources)
+    subframe->SetTitle(title);
+
+    // Give it an icon

 #ifdef __WXMSW__
 #ifdef __WXMSW__

-      subframe->SetIcon(wxIcon("chrt_icn"));
-#endif
-#ifdef __X__
-      subframe->SetIcon(wxIcon("aiai.xbm"));
+    subframe->SetIcon(wxIcon(_T("chrt_icn")));
+#else
+    subframe->SetIcon(wxIcon( mondrian_xpm ));

 #endif
 
 #endif
 

-      // Give it a status line
-      subframe->CreateStatusBar();
+    // Make a menubar
+    wxMenu *file_menu = new wxMenu;

 
 

-      // Make a menubar
-      wxMenu *file_menu = new wxMenu;
+    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"));

 
 

-      file_menu->Append(MDI_NEW_WINDOW, "&New window");
-      file_menu->Append(MDI_CHILD_QUIT, "&Close child");
-      file_menu->Append(MDI_QUIT, "&Exit");
+    wxMenu *option_menu = new wxMenu;

 
 

-      wxMenu *option_menu = new wxMenu;
+    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"));

 
 

-      // Dummy option
-      option_menu->Append(MDI_REFRESH, "&Refresh picture");
+    wxMenu *help_menu = new wxMenu;
+    help_menu->Append(MDI_ABOUT, _T("&About"));

 
 

-      wxMenu *help_menu = new wxMenu;
-      help_menu->Append(MDI_ABOUT, "&About");
+    wxMenuBar *menu_bar = new wxMenuBar;

 
 

-      wxMenuBar *menu_bar = new wxMenuBar;
+    menu_bar->Append(file_menu, _T("&File"));
+    menu_bar->Append(option_menu, _T("&Child"));
+    menu_bar->Append(help_menu, _T("&Help"));

 
 

-      menu_bar->Append(file_menu, "&File");
-      menu_bar->Append(option_menu, "&Options");
-      menu_bar->Append(help_menu, "&Help");
+    // Associate the menu bar with the frame
+    subframe->SetMenuBar(menu_bar);

 
 

-      // 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;
+    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;

 
 

-      // Give it scrollbars
-      canvas->SetScrollbars(20, 20, 50, 50);
+    // Give it scrollbars
+    canvas->SetScrollbars(20, 20, 50, 50);

 
 

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

 }
 
 }
 

-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-       EVT_MOUSE_EVENTS(MyCanvas::OnEvent)
-END_EVENT_TABLE()
+void MyFrame::OnSize(wxSizeEvent& event)
+{
+    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
+}
+
+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;
+    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->AddSeparator();
+    toolBar->AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, _T("Print"));
+    currentX += width + 5;
+    toolBar->AddSeparator();
+    toolBar->AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, _T("Help"));
+
+    toolBar->Realize();
+
+    int i;
+    for (i = 0; i < 8; i++)
+        delete bitmaps[i];
+}
+
+// ---------------------------------------------------------------------------
+// MyCanvas
+// ---------------------------------------------------------------------------

 
 // Define a constructor for my canvas
 
 // Define a constructor for my canvas

-MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
- wxScrolledWindow(parent, -1, pos, size, wxSUNKEN_BORDER)
+MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
+        : wxScrolledWindow(parent, -1, pos, size,
+                           wxSUNKEN_BORDER |
+                           wxNO_FULL_REPAINT_ON_RESIZE |
+                           wxVSCROLL | wxHSCROLL)

 {
 {

+    SetBackgroundColour(wxColour(_T("WHITE")));
+
+    m_dirty = FALSE;

 }
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
 }
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {

-  dc.SetFont(*wxSWISS_FONT);
-  dc.SetPen(*wxGREEN_PEN);
-  dc.DrawLine(0, 0, 200, 200);
-  dc.DrawLine(200, 0, 0, 200);
-
-  dc.SetBrush(*wxCYAN_BRUSH);
-  dc.SetPen(*wxRED_PEN);
-  dc.DrawRectangle(100, 100, 100, 50);
-  dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
-
-  dc.DrawEllipse(250, 250, 100, 50);
-  dc.DrawSpline(50, 200, 50, 100, 200, 10);
-  dc.DrawLine(50, 230, 200, 230);
-  dc.DrawText("This is a test string", 50, 230);
-
-  wxPoint points[3];
-  points[0].x = 200; points[0].y = 300;
-  points[1].x = 100; points[1].y = 400;
-  points[2].x = 300; points[2].y = 400;
-  
-  dc.DrawPolygon(3, points);
+    dc.SetFont(*wxSWISS_FONT);
+    dc.SetPen(*wxGREEN_PEN);
+    dc.DrawLine(0, 0, 200, 200);
+    dc.DrawLine(200, 0, 0, 200);
+
+    dc.SetBrush(*wxCYAN_BRUSH);
+    dc.SetPen(*wxRED_PEN);
+    dc.DrawRectangle(100, 100, 100, 50);
+    dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
+
+    dc.DrawEllipse(250, 250, 100, 50);
+#if wxUSE_SPLINES
+    dc.DrawSpline(50, 200, 50, 100, 200, 10);
+#endif // wxUSE_SPLINES
+    dc.DrawLine(50, 230, 200, 230);
+    dc.DrawText(_T("This is a test string"), 50, 230);
+
+    wxPoint points[3];
+    points[0].x = 200; points[0].y = 300;
+    points[1].x = 100; points[1].y = 400;
+    points[2].x = 300; points[2].y = 400;
+
+    dc.DrawPolygon(3, points);

 }
 
 }
 

-// This implements a tiny doodling program! Drag the mouse using
-// the left button.
+// This implements a tiny doodling program! Drag the mouse using the left
+// button.

 void MyCanvas::OnEvent(wxMouseEvent& event)
 {
 void MyCanvas::OnEvent(wxMouseEvent& event)
 {

-  wxClientDC dc(this);
-  PrepareDC(dc);
-
-  wxPoint pt(event.GetLogicalPosition(dc));
-
-  if (xpos > -1 && ypos > -1 && event.Dragging())
-  {
-    dc.SetPen(*wxBLACK_PEN);
-    dc.DrawLine(xpos, ypos, pt.x, pt.y);
-  }
-  xpos = pt.x;
-  ypos = pt.y;
-}
+    wxClientDC dc(this);
+    PrepareDC(dc);

 
 

-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
-  // Must delete children
-  wxNode *node = my_children.First();
-  while (node)
-  {
-    MyChild *child = (MyChild *)node->Data();
-    wxNode *next = node->Next();
-    child->OnClose();
-    delete child;
-    node = next;
-  }
-  return TRUE;
-}
+    wxPoint pt(event.GetLogicalPosition(dc));

 
 

-void MyFrame::OnSize(wxSizeEvent& event)
-{
-    int w, h;
-    GetClientSize(&w, &h);
-    int tw = 0;
-    int th = 0;
-    
-#ifdef __WXMSW__
-    wxWindow* tbar = GetToolBar();
-    if (tbar)
+    if (xpos > -1 && ypos > -1 && event.Dragging())

     {
     {

-        tbar->GetSize(&tw, &th);
-        tbar->SetSize(w, th);
+        dc.SetPen(*wxBLACK_PEN);
+        dc.DrawLine(xpos, ypos, pt.x, pt.y);
+
+        m_dirty = TRUE;

     }
     }

-#endif

 
 

-    textWindow->SetSize(0, th, 200, h-th);
-    GetClientWindow()->SetSize(200, th, w - 200, h-th);
+    xpos = pt.x;
+    ypos = pt.y;

 }
 
 }
 

-// Note that MDI_NEW_WINDOW and MDI_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_SIZE( MyChild::OnSize)
-END_EVENT_TABLE()
+// ---------------------------------------------------------------------------
+// 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,
+                 const wxPoint& pos, const wxSize& size,
+                 const long style)
+       : wxMDIChildFrame(parent, -1, title, pos, size,
+                         style | wxNO_FULL_REPAINT_ON_RESIZE)

 {
 {

-  canvas = NULL;
-  my_children.Append(this);
-}
+    canvas = (MyCanvas *) NULL;
+    my_children.Append(this);

 
 

-MyChild::~MyChild(void)
-{
-  my_children.DeleteObject(this);
+    // this should work for MDI frames as well as for normal ones
+    SetSizeHints(100, 100);

 }
 
 }
 

-void MyChild::OnSize(wxSizeEvent& WXUNUSED(event))
+MyChild::~MyChild()

 {
 {

-  int x = 0;
-  int y = 0;
-  GetClientSize( &x, &y );
-  if (canvas) canvas->SetSize( x, y );
+    my_children.DeleteObject(this);

 }
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-      Close(TRUE);
+    Close(TRUE);

 }
 
 }
 

-void MyChild::OnActivate(wxActivateEvent& event)
+void MyChild::OnRefresh(wxCommandEvent& WXUNUSED(event))

 {
 {

-  if (event.GetActive() && canvas)
-    canvas->SetFocus();
+    if ( canvas )
+        canvas->Refresh();

 }
 
 }
 

-bool MyChild::OnClose(void)
+void MyChild::OnChangePosition(wxCommandEvent& WXUNUSED(event))

 {
 {

-  return TRUE;
+    Move(10, 10);

 }
 
 }
 

-#ifdef __WXMSW__
-
-BEGIN_EVENT_TABLE(TestRibbon, wxToolBar)
-    EVT_PAINT(TestRibbon::OnPaint)
-END_EVENT_TABLE()
-
-TestRibbon::TestRibbon(wxFrame *frame, int x, int y, int w, int h,
-            long style, int direction, int RowsOrColumns):
-  wxToolBar(frame, -1, wxPoint(x, y), wxSize(w, h), style, direction, RowsOrColumns)
+void MyChild::OnChangeSize(wxCommandEvent& WXUNUSED(event))

 {
 {

-    wxBitmap* bitmaps[8];
+    SetClientSize(100, 100);
+}

 
 

-    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);
+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,
+                                       GetParent()->GetParent());
+    if ( !title )
+        return;
+
+    s_title = title;
+    SetTitle(s_title);
+//#endif
+}

 
 

-#ifdef __WXMSW__
-  int width = 24;
-#else
-  int width = 16;
-#endif
-  int offX = 5;
-  int currentX = 5;
-
-  AddTool(0, *bitmaps[0], wxNullBitmap, FALSE, currentX, -1, NULL, "New file");
-  currentX += width + 5;
-  AddTool(1, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, NULL, "Open file");
-  currentX += width + 5;
-  AddTool(2, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, NULL, "Save file");
-  currentX += width + 5;
-  AddSeparator();
-  AddTool(3, *bitmaps[3], wxNullBitmap, FALSE, currentX, -1, NULL, "Copy");
-  currentX += width + 5;
-  AddTool(4, *bitmaps[4], wxNullBitmap, FALSE, currentX, -1, NULL, "Cut");
-  currentX += width + 5;
-  AddTool(5, *bitmaps[5], wxNullBitmap, FALSE, currentX, -1, NULL, "Paste");
-  currentX += width + 5;
-  AddSeparator();
-  AddTool(6, *bitmaps[6], wxNullBitmap, FALSE, currentX, -1, NULL, "Print");
-  currentX += width + 5;
-  AddSeparator();
-  AddTool(7, *bitmaps[7], wxNullBitmap, TRUE, currentX, -1, NULL, "Help");
-
-  CreateTools();
-
-  int i;
-  for (i = 0; i < 8; i++)
-    delete bitmaps[i];
+void MyChild::OnActivate(wxActivateEvent& event)
+{
+    if ( event.GetActive() && canvas )
+        canvas->SetFocus();

 }
 
 }
 

-bool TestRibbon::OnLeftClick(int toolIndex, bool toggled)
+void MyChild::OnMove(wxMoveEvent& event)

 {
 {

-  char buf[200];
-  sprintf(buf, "Clicked on tool %d", toolIndex);
-  frame->SetStatusText(buf);
-  return TRUE;
+    // 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 TestRibbon::OnMouseEnter(int toolIndex)
+void MyChild::OnSize(wxSizeEvent& event)

 {
 {

-  char buf[200];
-  if (toolIndex > -1)
-  {
-    sprintf(buf, "This is tool number %d", toolIndex);
-    frame->SetStatusText(buf);
-  }
-  else frame->SetStatusText("");
+    // 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 TestRibbon::OnPaint(wxPaintEvent& event)
+void MyChild::OnClose(wxCloseEvent& event)

 {
 {

-  wxToolBar::OnPaint(event);
-
-  wxPaintDC dc(this);
-  
-  int w, h;
-  GetSize(&w, &h);
-  dc.SetPen(*wxBLACK_PEN);
-  dc.SetBrush(*wxTRANSPARENT_BRUSH);
-  dc.DrawLine(0, h-1, w, h-1);
+    if ( canvas && canvas->IsDirty() )
+    {
+        if ( wxMessageBox(_T("Really close?"), _T("Please confirm"),
+                          wxICON_QUESTION | wxYES_NO) != wxYES )
+        {
+            event.Veto();
+
+            return;
+        }
+    }
+
+    gs_nFrames--;
+
+    event.Skip();

 }
 
 }
 

-#endif
+