Disable some wxWebView tests that fail on the buildbot but not locally.

[wxWidgets.git] / samples / svg / svgtest.cpp

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 31c7f8875a091e5d324e4fc7f78fdb5f02cb8071..159a15cf9c0983c854a5e38bc79f78d0a6c11b4e 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -1,19 +1,10 @@
-// biol75@york.ac.uk (Chris Elliott) March 2000
-
-#ifdef __BIDE__
-#define _NO_VCL
-#include "condefs.h"
-USERC("svg.rc");
-//---------------------------------------------------------------------------
-#define WinMain WinMain
-#endif

 /////////////////////////////////////////////////////////////////////////////
 // Name:        svgtest.cpp
 // Purpose:     SVG sample
 // Author:      Chris Elliott
 // Modified by:
 // RCS-ID:      $Id$
 /////////////////////////////////////////////////////////////////////////////
 // Name:        svgtest.cpp
 // Purpose:     SVG sample
 // Author:      Chris Elliott
 // Modified by:
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -36,80 +27,95 @@ USERC("svg.rc");
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"
 #endif
 

-#include <wx/toolbar.h>
-#include <wx/svg/dcsvg.h>
-
-#include "mondrian.xpm"
+#include "wx/toolbar.h"
+#include "wx/dcsvg.h"
+#include "wx/vector.h"

 
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
 
 
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
 

+#if !defined(__WXMSW__) && !defined(__WXPM__)
+    #include "../sample.xpm"
+#endif
+

 class MyChild;
 class MyChild;

+class MyCanvas;
+
+// ---------------------------------------------------------------------------
+// classes
+// ---------------------------------------------------------------------------

 
 

-// Define a new application

 class MyApp : public wxApp
 {
 class MyApp : public wxApp
 {

-    public:
-        bool OnInit();
+public:
+    bool OnInit();

 };
 
 };
 

-// Define a new frame

 class MyFrame : public wxMDIParentFrame
 {
 class MyFrame : public wxMDIParentFrame
 {

-    public:
-        int nWinCreated;
+public:
+    MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
+            const wxPoint& pos, const wxSize& size, const long style);

 
 

-        wxList m_children;
+    void InitToolBar(wxToolBar* toolBar);

 
 

-        MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
-            const wxPoint& pos, const wxSize& size, const long style);
+    void OnSize(wxSizeEvent& event);
+    void OnAbout(wxCommandEvent& event);
+    void OnNewWindow(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    void FileSavePicture (wxCommandEvent& event);

 
 

-        void InitToolBar(wxToolBar* toolBar);
+    unsigned int GetCountOfChildren() const
+        { return m_nWinCreated; }

 
 

-        void OnSize(wxSizeEvent& event);
-        void OnAbout(wxCommandEvent& event);
-        void OnNewWindow(wxCommandEvent& event);
-        void OnQuit(wxCommandEvent& event);
-        void OnClose(wxCloseEvent& event);
-        void FileSavePicture (wxCommandEvent & WXUNUSED(event) ) ;
+private:
+    unsigned int m_nWinCreated;

 
 

-        DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

-
-class MyCanvas : public wxScrolledWindow
+class MyChild: public wxMDIChildFrame

 {
 {

-    public:
-        int m_index ;
+public:
+    MyChild(wxMDIParentFrame *parent, const wxString& title,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize,
+            const long style = wxDEFAULT_FRAME_STYLE);
+    ~MyChild();

 
 

-        MyChild * m_child ;
-        MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
-        virtual void OnDraw(wxDC& dc);
+    void OnActivate(wxActivateEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    bool OnSave(wxString filename);

 
 

-        DECLARE_EVENT_TABLE()
-};
+    MyFrame* GetFrame()
+        { return m_frame; }

 
 

-class MyChild: public wxMDIChildFrame
-{
-    public:
-        MyCanvas *m_canvas;
-        MyFrame  *m_frame ;
+private:
+    MyCanvas *m_canvas;
+    MyFrame  *m_frame;

 
 

-        //////////////////// Methods
+    DECLARE_EVENT_TABLE()
+};

 
 

-        MyChild(wxMDIParentFrame *parent, const wxString& title, const wxPoint& pos, const wxSize& size, const long style);
-        ~MyChild();
+class MyCanvas : public wxScrolledWindow
+{
+public:
+    MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size);
+    virtual void OnDraw(wxDC& dc);

 
 

-        void OnActivate(wxActivateEvent& event);
-        void OnQuit(wxCommandEvent& event);
-        void OnClose(wxCloseEvent& event);
-        bool OnSave(wxString filename) ;
+private:
+    int m_index;
+    MyChild* m_child;

 
 

-        DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()

 };
 
 };
 

+// ---------------------------------------------------------------------------
+// constants
+// ---------------------------------------------------------------------------
+

 // menu items ids
 enum
 {
 // menu items ids
 enum
 {


@@ -121,27 +127,17 @@ enum
     MDI_ABOUT
 };
 
     MDI_ABOUT
 };
 

-
-IMPLEMENT_APP(MyApp)
-
-// ---------------------------------------------------------------------------
-// global variables
-// ---------------------------------------------------------------------------
-
-MyFrame *frame = (MyFrame *) NULL;
-

 // ---------------------------------------------------------------------------
 // event tables
 // ---------------------------------------------------------------------------
 
 BEGIN_EVENT_TABLE(MyFrame, wxMDIParentFrame)
 // ---------------------------------------------------------------------------
 // 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 (MDI_SAVE, MyFrame::FileSavePicture)
-EVT_CLOSE(MyFrame::OnClose)
+    EVT_MENU(MDI_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(MDI_NEW_WINDOW, MyFrame::OnNewWindow)
+    EVT_MENU(MDI_QUIT, MyFrame::OnQuit)
+    EVT_MENU (MDI_SAVE, MyFrame::FileSavePicture)

 
 

-EVT_SIZE(MyFrame::OnSize)
+    EVT_SIZE(MyFrame::OnSize)

 END_EVENT_TABLE()
 
 // ===========================================================================
 END_EVENT_TABLE()
 
 // ===========================================================================


@@ -152,15 +148,34 @@ END_EVENT_TABLE()
 // MyApp
 // ---------------------------------------------------------------------------
 
 // MyApp
 // ---------------------------------------------------------------------------
 

-// Initialise this in OnInit, not statically
+IMPLEMENT_APP(MyApp)
+

 bool MyApp::OnInit()
 {
     // Create the main frame window
 
 bool MyApp::OnInit()
 {
     // Create the main frame window
 

-    frame = new MyFrame((wxFrame *)NULL, -1, wxT("SVG Demo"),
-        wxPoint(-1, -1), wxSize(500, 400),
-        wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
+    MyFrame* frame = new MyFrame((wxFrame *)NULL, -1, wxT("SVG Demo"),
+                                 wxDefaultPosition, wxSize(500, 400),
+                                 wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);

 
 

+    frame->Show(true);
+
+    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)
+{
+    m_nWinCreated = 0;
+
+    SetIcon(wxICON(sample));

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


@@ -177,107 +192,43 @@ bool MyApp::OnInit()
     menu_bar->Append(help_menu, wxT("&Help"));
 
     // Associate the menu bar with the frame
     menu_bar->Append(help_menu, wxT("&Help"));
 
     // Associate the menu bar with the frame

-    frame->SetMenuBar(menu_bar);
+    SetMenuBar(menu_bar);

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

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

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

-    frame->Show(true);
-
-    SetTopWindow(frame);
-
-    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)
-{
-    nWinCreated = 0 ;
-
-    // Give it an icon
-    SetIcon(wxICON(mondrian));
-

     CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());
     CreateToolBar(wxNO_BORDER | wxTB_FLAT | wxTB_HORIZONTAL);
     InitToolBar(GetToolBar());

-

 }
 
 }
 

-
-void MyFrame::OnClose(wxCloseEvent& event)
-{
-    if ( !event.CanVeto() )
-    {
-        event.Skip();
-        return ;
-    }
-    if ( m_children.GetCount () < 1 )
-    {
-        event.Skip();
-        return ;
-    }
-    // now try the children
-    wxObjectList::compatibility_iterator pNode = m_children.GetFirst ();
-    wxObjectList::compatibility_iterator pNext ;
-    MyChild * pChild ;
-    while ( pNode )
-    {
-        pNext = pNode -> GetNext ();
-        pChild = (MyChild*) pNode -> GetData ();
-        if (pChild -> Close ())
-        {
-            m_children.Erase(pNode) ;
-        }
-        else
-        {
-            event.Veto();
-            return;
-        }
-        pNode = pNext ;
-    }
-    event.Skip();
-}
-
-

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close();
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close();
 }
 

-

 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
-        wxT("Author: Chris Elliott (c) 2002\n")
-        wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
+    (void)wxMessageBox(wxT("wxWidgets SVG sample\n")
+        wxT("Author: Chris Elliott (c) 2002-2009\n")
+        wxT("Usage: click File|New to show tests"),
+        wxT("About SVG Test"));

 }
 
 }
 

-

 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 ;
+    MyChild *subframe = new MyChild(this, wxT("SVG Frame"));

 
 

-    m_children.Append (new MyChild(frame, wxT("SVG Frame"),
-        wxPoint(-1, -1), wxSize(-1, -1),
-        wxDEFAULT_FRAME_STYLE )   ) ;
-
-    subframe = (MyChild *) m_children.GetLast() -> GetData ();

     wxString title;
     wxString title;

-    title.Printf(wxT("SVG Test Window %d"), nWinCreated );
+    title.Printf(wxT("SVG Test Window %d"), m_nWinCreated );
+

     // counts number of children previously, even if now closed
     // counts number of children previously, even if now closed

-    nWinCreated ++ ;
+    m_nWinCreated ++;

 
     // Give it a title and icon
     subframe->SetTitle(title);
 
     // Give it a title and icon
     subframe->SetTitle(title);

-    subframe->SetIcon(wxICON(mondrian));
+    subframe->SetIcon(wxICON(sample));

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


@@ -298,10 +249,9 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 

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

 }
 
 }
 

-

 void MyFrame::OnSize(wxSizeEvent& event)
 {
     int w, h;
 void MyFrame::OnSize(wxSizeEvent& event)
 {
     int w, h;


@@ -311,25 +261,19 @@ void MyFrame::OnSize(wxSizeEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-

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

-    const int maxBitmaps = 3 ;
+    const int maxBitmaps = 3;

     wxBitmap* bitmaps[maxBitmaps];
 
     bitmaps[0] = new wxBitmap( new_xpm );
     bitmaps[1] = new wxBitmap( save_xpm );
     bitmaps[2] = new wxBitmap( help_xpm );
 
     wxBitmap* bitmaps[maxBitmaps];
 
     bitmaps[0] = new wxBitmap( new_xpm );
     bitmaps[1] = new wxBitmap( save_xpm );
     bitmaps[2] = new wxBitmap( help_xpm );
 

-    int width = 16;
-    int currentX = 5;
-
-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("New SVG test window"));
-    currentX += width + 5;
-    toolBar->AddTool( MDI_SAVE, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Save test in SVG format"));
-    currentX += width + 5;
+    toolBar->AddTool(MDI_NEW_WINDOW, wxEmptyString, *(bitmaps[0]), wxS("New SVG test window"));
+    toolBar->AddTool(MDI_SAVE, wxEmptyString, *bitmaps[1], wxS("Save test in SVG format"));

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

-    toolBar->AddTool(MDI_ABOUT, *bitmaps[2], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Help"));
+    toolBar->AddTool(MDI_ABOUT, wxEmptyString, *bitmaps[2], wxS("Help"));

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


@@ -338,74 +282,64 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
         delete bitmaps[i];
 }
 
         delete bitmaps[i];
 }
 

-

 void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
 {
 void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
 {

-    MyChild * pChild = (MyChild *)GetActiveChild ();
+#if wxUSE_FILEDLG
+    MyChild * pChild = (MyChild *)GetActiveChild();

     if (pChild == NULL)
     {
     if (pChild == NULL)
     {

-        return ;
+        return;

     }
 
     wxFileDialog dialog(this, wxT("Save Picture as"), wxEmptyString, pChild->GetTitle(),
         wxT("SVG vector picture files (*.svg)|*.svg"),
     }
 
     wxFileDialog dialog(this, wxT("Save Picture as"), wxEmptyString, pChild->GetTitle(),
         wxT("SVG vector picture files (*.svg)|*.svg"),

-        wxSAVE|wxOVERWRITE_PROMPT);
+        wxFD_SAVE|wxFD_OVERWRITE_PROMPT);

 
     if (dialog.ShowModal() == wxID_OK)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {

-        if (!pChild -> OnSave ( dialog.GetPath() ))
+        if (!pChild->OnSave ( dialog.GetPath() ))

         {
         {

-            return ;
+            return;

         }
     }
         }
     }

-    return ;
+    return;
+#endif // wxUSE_FILEDLG

 }
 
 
 }
 
 

-// 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_CLOSE(MyChild::OnClose)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
-
-END_EVENT_TABLE()
-

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

+BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
+END_EVENT_TABLE()
+

 // 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|wxVSCROLL|wxHSCROLL)
+MyCanvas::MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size)
+    : wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)

 {
 {

-    m_child = (MyChild *) parent ;
-    SetBackgroundColour(wxColour(_T("WHITE")));
-    m_index = m_child->m_frame->nWinCreated % 7 ;
-}
+    SetBackgroundColour(wxColour(wxT("WHITE")));

 
 

+    m_child = parent;
+    m_index = m_child->GetFrame()->GetCountOfChildren() % 7;
+}

 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...
 #if wxUSE_STATUSBAR
 
 // Define the repainting behaviour
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...
 #if wxUSE_STATUSBAR

-    wxString s ;
+    wxString s;

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

-    wxPen wP ;
-    wxBrush wB ;
+    wxPen wP;
+    wxBrush wB;

     wxPoint points[6];
     wxColour wC;
     wxPoint points[6];
     wxColour wC;

-    wxFont wF ;
+    wxFont wF;

 
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
 
 
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
 

-

     switch (m_index)
     {
         default:
     switch (m_index)
     {
         default:


@@ -414,27 +348,27 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             // draw point colored line and spline
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             // draw point colored line and spline

-            wP = *wxCYAN_PEN ;
+            wP = *wxCYAN_PEN;

             wP.SetWidth(3);
             dc.SetPen(wP);
 
             wP.SetWidth(3);
             dc.SetPen(wP);
 

-            dc.DrawPoint (25,15) ;
+            dc.DrawPoint (25,15);

             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);
 #if wxUSE_STATUSBAR
             s = wxT("Green Cross, Cyan Line and spline");
 #endif // wxUSE_STATUSBAR
             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);
 #if wxUSE_STATUSBAR
             s = wxT("Green Cross, Cyan Line and spline");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 1:
             // draw standard shapes
             dc.SetBrush(*wxCYAN_BRUSH);
             dc.SetPen(*wxRED_PEN);
             dc.DrawRectangle(10, 10, 100, 70);
 
         case 1:
             // draw standard shapes
             dc.SetBrush(*wxCYAN_BRUSH);
             dc.SetPen(*wxRED_PEN);
             dc.DrawRectangle(10, 10, 100, 70);

-            wB = wxBrush (_T("DARK ORCHID"), wxTRANSPARENT);
+            wB = wxBrush (wxT("DARK ORCHID"), wxBRUSHSTYLE_TRANSPARENT);

             dc.SetBrush (wB);
             dc.DrawRoundedRectangle(50, 50, 100, 70, 20);
             dc.SetBrush (wB);
             dc.DrawRoundedRectangle(50, 50, 100, 70, 20);

-            dc.SetBrush (wxBrush(_T("GOLDENROD"), wxSOLID) );
+            dc.SetBrush (wxBrush(wxT("GOLDENROD")) );

             dc.DrawEllipse(100, 100, 100, 50);
 
             points[0].x = 100; points[0].y = 200;
             dc.DrawEllipse(100, 100, 100, 50);
 
             points[0].x = 100; points[0].y = 200;


@@ -449,29 +383,29 @@ void MyCanvas::OnDraw(wxDC& dc)
 #if wxUSE_STATUSBAR
             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 2:
             // draw text in Arial or similar font
             dc.DrawLine(50,25,50,35);
             dc.DrawLine(45,30,55,30);
             dc.DrawText(wxT("This is a Swiss-style string"), 50, 30);
 
         case 2:
             // draw text in Arial or similar font
             dc.DrawLine(50,25,50,35);
             dc.DrawLine(45,30,55,30);
             dc.DrawText(wxT("This is a Swiss-style string"), 50, 30);

-            wC = dc.GetTextForeground() ;
-            dc.SetTextForeground (_T("FIREBRICK"));
+            wC = dc.GetTextForeground();
+            dc.SetTextForeground (wxT("FIREBRICK"));

 
             // no effect in msw ??
 
             // no effect in msw ??

-            dc.SetTextBackground (_T("WHEAT"));
+            dc.SetTextBackground (wxT("WHEAT"));

             dc.DrawText(wxT("This is a Red string"), 50, 200);
             dc.DrawRotatedText(wxT("This is a 45 deg string"), 50, 200, 45);
             dc.DrawRotatedText(wxT("This is a 90 deg string"), 50, 200, 90);
             dc.DrawText(wxT("This is a Red string"), 50, 200);
             dc.DrawRotatedText(wxT("This is a 45 deg string"), 50, 200, 45);
             dc.DrawRotatedText(wxT("This is a 90 deg string"), 50, 200, 90);

-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, FALSE, wxT("Times New Roman"));
+            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));

             dc.SetFont(wF);
             dc.SetFont(wF);

-            dc.SetTextForeground (wC) ;
+            dc.SetTextForeground (wC);

             dc.DrawText(wxT("This is a Times-style string"), 50, 60);
 #if wxUSE_STATUSBAR
             s = wxT("Swiss, Times text; red text, rotated and colored orange");
 #endif // wxUSE_STATUSBAR
             dc.DrawText(wxT("This is a Times-style string"), 50, 60);
 #if wxUSE_STATUSBAR
             s = wxT("Swiss, Times text; red text, rotated and colored orange");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 3 :
             // four arcs start and end points, center
 
         case 3 :
             // four arcs start and end points, center


@@ -483,51 +417,51 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
             dc.SetDeviceOrigin(0,0);
 
             dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 );
             dc.SetDeviceOrigin(0,0);
 

-            wP.SetColour (_T("CADET BLUE"));
+            wP.SetColour (wxT("CADET BLUE"));

             dc.SetPen(wP);
             dc.DrawArc ( 75,125, 110, 40, 75, 75 );
 
             dc.SetPen(wP);
             dc.DrawArc ( 75,125, 110, 40, 75, 75 );
 

-            wP.SetColour (_T("SALMON"));
+            wP.SetColour (wxT("SALMON"));

             dc.SetPen(wP);
             dc.SetBrush(*wxRED_BRUSH);
             //top left corner, width and height, start and end angle
                                  // 315 same center and x-radius as last pie-arc, half Y radius
             dc.SetPen(wP);
             dc.SetBrush(*wxRED_BRUSH);
             //top left corner, width and height, start and end angle
                                  // 315 same center and x-radius as last pie-arc, half Y radius

-            dc.DrawEllipticArc(25,50,100,50,180.0,45.0) ;
+            dc.DrawEllipticArc(25,50,100,50,180.0,45.0);

 
 

-            wP = *wxCYAN_PEN ;
+            wP = *wxCYAN_PEN;

             wP.SetWidth(3);
             dc.SetPen(wP);
                                  //wxTRANSPARENT));
             wP.SetWidth(3);
             dc.SetPen(wP);
                                  //wxTRANSPARENT));

-            dc.SetBrush (wxBrush (_T("SALMON"),wxSOLID)) ;
-            dc.DrawEllipticArc(300,  0,200,100, 0.0,145.0) ;
+            dc.SetBrush (wxBrush (wxT("SALMON")));
+            dc.DrawEllipticArc(300,  0,200,100, 0.0,145.0);

                                  //same end point
                                  //same end point

-            dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
-            dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
+            dc.DrawEllipticArc(300, 50,200,100,90.0,145.0);
+            dc.DrawEllipticArc(300,100,200,100,90.0,345.0);

 
 #if wxUSE_STATUSBAR
             s = wxT("This is an arc test page");
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR
             s = wxT("This is an arc test page");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 4:
             dc.DrawCheckMark ( 30,30,25,25);
 
         case 4:
             dc.DrawCheckMark ( 30,30,25,25);

-            dc.SetBrush (wxBrush (_T("SALMON"),wxTRANSPARENT));
+            dc.SetBrush (wxBrush (wxT("SALMON"),wxBRUSHSTYLE_TRANSPARENT));

             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);
 #if wxUSE_STATUSBAR
             s = wxT("Two check marks");
 #endif // wxUSE_STATUSBAR
             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);
 #if wxUSE_STATUSBAR
             s = wxT("Two check marks");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 5:
 
         case 5:

-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, FALSE, wxT("Times New Roman"));
+            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));

             dc.SetFont(wF);
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string"), 50, 60);
 
             // rescale and draw in blue
             dc.SetFont(wF);
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string"), 50, 60);
 
             // rescale and draw in blue

-            wP = *wxCYAN_PEN ;
+            wP = *wxCYAN_PEN;

             dc.SetPen(wP);
             dc.SetUserScale (2.0,0.5);
             dc.SetDeviceOrigin(200,0);
             dc.SetPen(wP);
             dc.SetUserScale (2.0,0.5);
             dc.SetDeviceOrigin(200,0);


@@ -538,26 +472,26 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetDeviceOrigin(200,200);
             dc.DrawText(wxT("This is an 18pt string 2 x 2 UserScaled"), 50, 60);
 
             dc.SetDeviceOrigin(200,200);
             dc.DrawText(wxT("This is an 18pt string 2 x 2 UserScaled"), 50, 60);
 

-            wP = *wxRED_PEN ;
+            wP = *wxRED_PEN;

             dc.SetPen(wP);
             dc.SetUserScale (1.0,1.0);
             dc.SetDeviceOrigin(0,10);
             dc.SetPen(wP);
             dc.SetUserScale (1.0,1.0);
             dc.SetDeviceOrigin(0,10);

-            dc.SetMapMode (wxMM_METRIC) ; //svg ignores this
+            dc.SetMapMode (wxMM_METRIC); //svg ignores this

             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60);
 #if wxUSE_STATUSBAR
             s = wxT("Scaling test page");
 #endif // wxUSE_STATUSBAR
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
             dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60);
 #if wxUSE_STATUSBAR
             s = wxT("Scaling test page");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
         case 6:
 
         case 6:

-            dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
+            dc.DrawIcon( wxICON(sample), 10, 10 );

             dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
 #if wxUSE_STATUSBAR
             s = wxT("Icon and Bitmap ");
 #endif // wxUSE_STATUSBAR
             dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
 #if wxUSE_STATUSBAR
             s = wxT("Icon and Bitmap ");
 #endif // wxUSE_STATUSBAR

-            break ;
+            break;

 
     }
 #if wxUSE_STATUSBAR
 
     }
 #if wxUSE_STATUSBAR


@@ -566,62 +500,54 @@ void MyCanvas::OnDraw(wxDC& dc)
 }
 
 
 }
 
 

-
-

 // ---------------------------------------------------------------------------
 // MyChild
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // MyChild
 // ---------------------------------------------------------------------------
 

+// 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)
+END_EVENT_TABLE()
+

 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,
 MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title,

-const wxPoint& pos, const wxSize& size,
-const long style)
-: wxMDIChildFrame(parent, -1, title, pos, size, style)
+                 const wxPoint& pos, const wxSize& size,
+                 const long style)
+    : wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style)

 {
 {

+    m_frame = (MyFrame *) parent;

 
 

-    m_frame = (MyFrame *) parent ;

 #if wxUSE_STATUSBAR
     CreateStatusBar();
     SetStatusText(title);
 #endif // wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR
     CreateStatusBar();
     SetStatusText(title);
 #endif // wxUSE_STATUSBAR
 

-    int w, h ;
-    GetClientSize ( &w, &h );
-    m_canvas = new MyCanvas(this, wxPoint(0, 0),  wxSize (w,h)  );
+    m_canvas = new MyCanvas(this, wxPoint(0, 0), GetClientSize());
+

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

-

 }
 
 }
 

-

 MyChild::~MyChild()
 {
 MyChild::~MyChild()
 {

-    m_frame->m_children.DeleteObject(this);

 }
 
 }
 

-

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

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

 }
 
 }
 

-

 bool MyChild::OnSave(wxString filename)
 {
 bool MyChild::OnSave(wxString filename)
 {

-    wxSVGFileDC svgDC (filename, 600, 650) ;
+    wxSVGFileDC svgDC (filename, 600, 650);

     m_canvas->OnDraw (svgDC);
     m_canvas->OnDraw (svgDC);

-    return svgDC.Ok();
+    return svgDC.IsOk();

 }
 
 }
 

-
-

 void MyChild::OnActivate(wxActivateEvent& event)
 {
     if ( event.GetActive() && m_canvas )
         m_canvas->SetFocus();
 }
 
 void MyChild::OnActivate(wxActivateEvent& event)
 {
     if ( event.GetActive() && m_canvas )
         m_canvas->SetFocus();
 }
 

-
-void MyChild::OnClose(wxCloseEvent& event)
-{
-    event.Skip();
-}