X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d6f0a4b367c6d68d9fea84817f5a982163665f37..40711af81b4a412892045837997211d597d98ff2:/samples/drawing/drawing.cpp?ds=sidebyside

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index aa985078e8..31f673167b 100644
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        drawing.cpp
+// Name:        samples/drawing/drawing.cpp
 // Purpose:     shows and tests wxDC features
 // Author:      Robert Roebling
 // Modified by:
@@ -17,9 +17,9 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "drawing.cpp"
-    #pragma interface "drawing.cpp"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma implementation
+    #pragma interface
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
@@ -30,20 +30,21 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
 #include "wx/colordlg.h"
 #include "wx/image.h"
+#include "wx/artprov.h"
 
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
     #include "mondrian.xpm"
 #endif
 
@@ -58,21 +59,26 @@ enum ScreenToShow
     Show_Default,
     Show_Text,
     Show_Lines,
+    Show_Brushes,
     Show_Polygons,
     Show_Mask,
-    Show_Ops
+    Show_Ops,
+    Show_Regions,
+    Show_Circles,
+    Show_Splines
 };
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
-static wxBitmap gs_bmpNoMask,
-                gs_bmpWithColMask,
-                gs_bmpMask,
-                gs_bmpWithMask,
-                gs_bmp4,
-                gs_bmp36;
+static wxBitmap *gs_bmpNoMask = NULL,
+                *gs_bmpWithColMask = NULL,
+                *gs_bmpMask = NULL,
+                *gs_bmpWithMask = NULL,
+                *gs_bmp4 = NULL,
+                *gs_bmp4_mono = NULL,
+                *gs_bmp36 = NULL;
 
 // ----------------------------------------------------------------------------
 // private classes
@@ -90,7 +96,11 @@ public:
     // return: if OnInit() returns false, the application terminates)
     virtual bool OnInit();
 
+    virtual int OnExit() { DeleteBitmaps(); return 0; }
+
 protected:
+    void DeleteBitmaps();
+
     bool LoadImages();
 };
 
@@ -106,10 +116,13 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
+    void OnClip(wxCommandEvent& event);
     void OnShow(wxCommandEvent &event);
     void OnOption(wxCommandEvent &event);
 
+#if wxUSE_COLOURDLG
     wxColour SelectColour();
+#endif // wxUSE_COLOURDLG
     void PrepareDC(wxDC& dc);
 
     int         m_backgroundMode;
@@ -127,7 +140,7 @@ public:
     MyCanvas   *m_canvas;
 
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
@@ -140,20 +153,32 @@ public:
     void OnPaint(wxPaintEvent &event);
     void OnMouseMove(wxMouseEvent &event);
 
-    void Show(ScreenToShow show) { m_show = show; Refresh(); }
+    void ToShow(ScreenToShow show) { m_show = show; Refresh(); }
+
+    // set or remove the clipping region
+    void Clip(bool clip) { m_clip = clip; Refresh(); }
 
 protected:
-    void DrawTestPoly( int x, int y, wxDC &dc ,int transparent );
     void DrawTestLines( int x, int y, int width, wxDC &dc );
+    void DrawTestPoly(wxDC& dc);
+    void DrawTestBrushes(wxDC& dc);
     void DrawText(wxDC& dc);
     void DrawImages(wxDC& dc);
     void DrawWithLogicalOps(wxDC& dc);
+    void DrawRegions(wxDC& dc);
+    void DrawCircles(wxDC& dc);
+    void DrawSplines(wxDC& dc);
     void DrawDefault(wxDC& dc);
 
+    void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime);
+
 private:
     MyFrame *m_owner;
 
     ScreenToShow m_show;
+    wxBitmap     m_smile_bmp;
+    wxIcon       m_std_icon;
+    bool         m_clip;
 
     DECLARE_EVENT_TABLE()
 };
@@ -166,17 +191,23 @@ private:
 enum
 {
     // menu items
-    File_Quit = 1,
-    File_About,
+    File_Quit = wxID_EXIT,
+    File_About = wxID_ABOUT,
 
-    MenuShow_First,
+    MenuShow_First = wxID_HIGHEST,
     File_ShowDefault = MenuShow_First,
     File_ShowText,
     File_ShowLines,
+    File_ShowBrushes,
     File_ShowPolygons,
     File_ShowMask,
     File_ShowOps,
-    MenuShow_Last = File_ShowOps,
+    File_ShowRegions,
+    File_ShowCircles,
+    File_ShowSplines,
+    MenuShow_Last = File_ShowSplines,
+
+    File_Clip,
 
     MenuOption_First,
 
@@ -199,10 +230,14 @@ enum
     LogicalOrigin_MoveUp,
     LogicalOrigin_MoveLeft,
     LogicalOrigin_MoveRight,
+    LogicalOrigin_Set,
+    LogicalOrigin_Restore,
 
+#if wxUSE_COLOURDLG
     Colour_TextForeground,
     Colour_TextBackground,
     Colour_Background,
+#endif // wxUSE_COLOURDLG
     Colour_BackgroundMode,
     Colour_TextureBackgound,
 
@@ -210,11 +245,11 @@ enum
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -231,335 +266,248 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::LoadImages()
 {
+    gs_bmpNoMask = new wxBitmap;
+    gs_bmpWithColMask = new wxBitmap;
+    gs_bmpMask = new wxBitmap;
+    gs_bmpWithMask = new wxBitmap;
+    gs_bmp4 = new wxBitmap;
+    gs_bmp4_mono = new wxBitmap;
+    gs_bmp36 = new wxBitmap;
+
     wxPathList pathList;
-    pathList.Add(".");
-    pathList.Add("..");
+    pathList.Add(_T("."));
+    pathList.Add(_T(".."));
 
-    wxString path = pathList.FindValidPath("pat4.bmp");
+    wxString path = pathList.FindValidPath(_T("pat4.bmp"));
     if ( !path )
-        return FALSE;
-    gs_bmp4.LoadFile(path, wxBITMAP_TYPE_BMP);
-    wxMask* mask4 = new wxMask(gs_bmp4, *wxBLACK);
-    gs_bmp4.SetMask(mask4);
+        return false;
 
-    path = pathList.FindValidPath("pat36.bmp");
-    if ( !path )
-        return FALSE;
-    gs_bmp36.LoadFile(path, wxBITMAP_TYPE_BMP);
-    wxMask* mask36 = new wxMask(gs_bmp36, *wxBLACK);
-    gs_bmp36.SetMask(mask36);
+    /* 4 colour bitmap */
+    gs_bmp4->LoadFile(path, wxBITMAP_TYPE_BMP);
+    /* turn into mono-bitmap */
+    gs_bmp4_mono->LoadFile(path, wxBITMAP_TYPE_BMP);
+    wxMask* mask4 = new wxMask(*gs_bmp4_mono, *wxBLACK);
+    gs_bmp4_mono->SetMask(mask4);
 
-    path = pathList.FindValidPath("image.bmp");
+    path = pathList.FindValidPath(_T("pat36.bmp"));
     if ( !path )
-        return FALSE;
-    gs_bmpNoMask.LoadFile(path, wxBITMAP_TYPE_BMP);
-    gs_bmpWithMask.LoadFile(path, wxBITMAP_TYPE_BMP);
-    gs_bmpWithColMask.LoadFile(path, wxBITMAP_TYPE_BMP);
+        return false;
+    gs_bmp36->LoadFile(path, wxBITMAP_TYPE_BMP);
+    wxMask* mask36 = new wxMask(*gs_bmp36, *wxBLACK);
+    gs_bmp36->SetMask(mask36);
 
-    path = pathList.FindValidPath("mask.bmp");
+    path = pathList.FindValidPath(_T("image.bmp"));
     if ( !path )
-        return FALSE;
-    gs_bmpMask.LoadFile(path, wxBITMAP_TYPE_BMP);
+        return false;
+    gs_bmpNoMask->LoadFile(path, wxBITMAP_TYPE_BMP);
+    gs_bmpWithMask->LoadFile(path, wxBITMAP_TYPE_BMP);
+    gs_bmpWithColMask->LoadFile(path, wxBITMAP_TYPE_BMP);
 
-//    This is so wrong, it hurts.
-//    gs_bmpMask.SetDepth(1);
-//    wxMask *mask = new wxMask(gs_bmpMask);
+    path = pathList.FindValidPath(_T("mask.bmp"));
+    if ( !path )
+        return false;
+    gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP);
 
-    wxMask *mask = new wxMask(gs_bmpMask, *wxBLACK);
-    gs_bmpWithMask.SetMask(mask);
+    wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK);
+    gs_bmpWithMask->SetMask(mask);
 
-    mask = new wxMask(gs_bmpWithColMask, *wxWHITE);
-    gs_bmpWithColMask.SetMask(mask);
+    mask = new wxMask(*gs_bmpWithColMask, *wxWHITE);
+    gs_bmpWithColMask->SetMask(mask);
 
-    return TRUE;
+    return true;
 }
 
 // `Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
     // Create the main application window
-    MyFrame *frame = new MyFrame("Drawing sample",
+    MyFrame *frame = new MyFrame(_T("Drawing sample"),
                                  wxPoint(50, 50), wxSize(550, 340));
 
     // Show it and tell the application that it's our main window
-    frame->Show(TRUE);
+    frame->Show(true);
     SetTopWindow(frame);
 
     if ( !LoadImages() )
     {
-        wxLogError("Can't load one of the bitmap files needed for this sample "
-                   "from the current or parent directory, please copy them "
-                   "there.");
+        wxLogError(wxT("Can't load one of the bitmap files needed ")
+                   wxT("for this sample from the current or parent ")
+                   wxT("directory, please copy them there."));
 
         // stop here
-        return FALSE;
+        DeleteBitmaps();
+
+        return false;
     }
 
     // ok, continue
-    return TRUE;
+    return true;
+}
+
+void MyApp::DeleteBitmaps()
+{
+    delete gs_bmpNoMask;
+    delete gs_bmpWithColMask;
+    delete gs_bmpMask;
+    delete gs_bmpWithMask;
+    delete gs_bmp4;
+    delete gs_bmp4_mono;
+    delete gs_bmp36;
+
+    gs_bmpNoMask = NULL;
+    gs_bmpWithColMask = NULL;
+    gs_bmpMask = NULL;
+    gs_bmpWithMask = NULL;
+    gs_bmp4 = NULL;
+    gs_bmp4_mono = NULL;
+    gs_bmp36 = NULL;
 }
 
 // ----------------------------------------------------------------------------
 // MyCanvas
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them.
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_PAINT  (MyCanvas::OnPaint)
     EVT_MOTION (MyCanvas::OnMouseMove)
 END_EVENT_TABLE()
 
-MyCanvas::MyCanvas( MyFrame *parent ) : wxScrolledWindow( parent )
+#include "smile.xpm"
+
+MyCanvas::MyCanvas(MyFrame *parent)
+        : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
+                           wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     m_owner = parent;
     m_show = Show_Default;
+    m_smile_bmp = wxBitmap(smile_xpm);
+    m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION);
+    m_clip = false;
 }
 
-//draw a polygon and an overlapping rectangle
-//is transparent is 1, the fill pattern are made transparent
-//is transparent is 2, the fill pattern are made transparent but inversed
-//is transparent is 0 the text for and background color will be used to represent/map
-//the colors of the monochrome bitmap pixels to the fillpattern
-//
-//i miss_used the the menu items for setting so called back and fore ground color
-//just to show how the those colors do influence the fillpatterns
-//just play with those,
-//and with the code
-//variations are endless using other logical functions
-void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent )
+void MyCanvas::DrawTestBrushes(wxDC& dc)
 {
-    wxBrush* brush4  = new wxBrush(gs_bmp4);
-    wxBrush* brush36 = new wxBrush(gs_bmp36);
-
-    wxPoint todraw[5];
-    todraw[0].x=(long)x+100;
-    todraw[0].y=(long)y+100;
-    todraw[1].x=(long)x+300;
-    todraw[1].y=(long)y+100;
-    todraw[2].x=(long)x+300;
-    todraw[2].y=(long)y+300;
-    todraw[3].x=(long)x+150;
-    todraw[3].y=(long)y+350;
-    todraw[4].x=(long)x+100;
-    todraw[4].y=(long)y+300;
-
-    wxPoint todraw2[5];
-    todraw2[0].x=100;
-    todraw2[0].y=100;
-    todraw2[1].x=300;
-    todraw2[1].y=100;
-    todraw2[2].x=300;
-    todraw2[2].y=300;
-    todraw2[3].x=150;
-    todraw2[3].y=350;
-    todraw2[4].x=100;
-    todraw2[4].y=300;
-
-    switch (transparent)
-    {
-        case 0:
-            {
-                dc.SetPen( wxPen( "black", 4, wxSOLID) );
-                dc.SetBrush( *brush4 );
-                dc.SetTextForeground(*wxGREEN);
-                dc.SetTextBackground(m_owner->m_colourForeground);
-                dc.SetLogicalFunction(wxCOPY);
-                dc.DrawPolygon(5,todraw,0,0,wxWINDING_RULE);
-
-                //don't understand hwo but the outline is also depending on logicalfunction
-                dc.SetPen( wxPen( "red", 4, wxSOLID) );
-                dc.SetBrush( *brush36 );
-                dc.SetTextForeground(*wxCYAN);
-                dc.SetTextBackground(m_owner->m_colourBackground);
-                dc.SetLogicalFunction(wxCOPY);
-                dc.DrawRectangle( x+10, y+10, 200, 200 );
-                dc.SetBrush(wxNullBrush);
-                dc.SetPen(wxNullPen);
-                break;
-            }
-        case 1:  //now with transparent fillpatterns
-            {
-
-                wxBitmap* bmpBlit = new wxBitmap(600,400);
-                wxMemoryDC* memDC= new wxMemoryDC();
-                //      wxBrush _clearbrush(*wxGREEN,wxSOLID);
-                wxBrush _clearbrush(*wxBLACK,wxSOLID);
-                memDC->SelectObject(*bmpBlit);
-                memDC->BeginDrawing();
-                memDC->SetBackground(_clearbrush);
-                memDC->Clear();
-                memDC->SetBackground(wxNullBrush);
-
-                memDC->SetPen( wxPen( "black", 4, wxSOLID) );
-                memDC->SetBrush( wxNullBrush);
-                memDC->SetBrush( *brush4 );
-                memDC->SetTextForeground(*wxBLACK);            // 0s --> 0x000000 (black)
-                memDC->SetTextBackground(*wxWHITE);    // 1s --> 0xFFFFFF (white)
-                memDC->SetLogicalFunction(wxAND_INVERT);
-
-                // BLACK OUT the opaque pixels and leave the rest as is
-                memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
-                // Set background and foreground colors for fill pattern
-                //the previous blacked out pixels are now merged with the layer color
-                //while the non blacked out pixels stay as they are.
-                memDC->SetTextForeground(*wxBLACK);            // 0s --> 0x000000 (black)
-
-                //now define what will be the color of the fillpattern parts that are not transparent
-                //      memDC->SetTextBackground(*wxBLUE);
-                memDC->SetTextBackground(m_owner->m_colourForeground);
-                memDC->SetLogicalFunction(wxOR);
-
-
-                //don't understand how but the outline is also depending on logicalfunction
-                memDC->SetPen( wxPen( "red", 4, wxSOLID) );
-                memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
-                memDC->SetLogicalFunction(wxCOPY);
-
-                memDC->SetPen( wxPen( "black", 4, wxSOLID) );
-                memDC->SetBrush( wxNullBrush);
-                memDC->SetBrush( *brush36 );
-                memDC->SetTextForeground(*wxBLACK);            // 0s --> 0x000000 (black)
-                memDC->SetTextBackground(*wxWHITE);    // 1s --> 0xFFFFFF (white)
-                memDC->SetLogicalFunction(wxAND_INVERT);
-
-                memDC->DrawRectangle( 10, 10, 200, 200 );
-
-                // Set background and foreground colors for fill pattern
-                //the previous blacked out pixels are now merged with the layer color
-                //while the non blacked out pixels stay as they are.
-                memDC->SetTextForeground(*wxBLACK);            // 0s --> 0x000000 (black)
-                //now define what will be the color of the fillpattern parts that are not transparent
-                //      memDC->SetTextBackground(*wxRED);
-                memDC->SetTextBackground(m_owner->m_colourBackground);
-                memDC->SetLogicalFunction(wxOR);
-
-                //don't understand how but the outline is also depending on logicalfunction
-                memDC->SetPen( wxPen( "yellow", 4, wxSOLID) );
-                memDC->DrawRectangle( 10, 10, 200, 200 );
-
-                memDC->SetBrush(wxNullBrush);
-                memDC->SetPen(wxNullPen);
-
-                memDC->EndDrawing();
-                dc.Blit(x,y,600,400,memDC,0,0,wxCOPY);
-                delete bmpBlit;
-                delete memDC;
-                break;
-            }
-        case 2:  //now with transparent inversed fillpatterns
-            {
-                wxBitmap* bmpBlit = new wxBitmap(600,400);
-                wxMemoryDC* memDC= new wxMemoryDC();
-                wxBrush _clearbrush(*wxWHITE,wxSOLID);
-                memDC->SelectObject(*bmpBlit);
-                memDC->BeginDrawing();
-                memDC->SetBackground(_clearbrush);
-                memDC->Clear();
-                memDC->SetBackground(wxNullBrush);
-
-                memDC->SetPen( wxPen( "black", 4, wxSOLID) );
-                memDC->SetBrush( *brush4 );
-                memDC->SetTextBackground(*wxBLACK);            // 0s --> 0x000000 (black)
-                memDC->SetTextForeground(*wxWHITE);    // 1s --> 0xFFFFFF (white)
-                memDC->SetLogicalFunction(wxAND_INVERT);
-
-                // BLACK OUT the opaque pixels and leave the rest as is
-                memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
-                // Set background and foreground colors for fill pattern
-                //the previous blacked out pixels are now merged with the layer color
-                //while the non blacked out pixels stay as they are.
-                memDC->SetTextBackground(*wxBLACK);            // 0s --> 0x000000 (black)
-
-                //now define what will be the color of the fillpattern parts that are not transparent
-                memDC->SetTextForeground(m_owner->m_colourForeground);
-                memDC->SetLogicalFunction(wxOR);
-
-
-                //don't understand how but the outline is also depending on logicalfunction
-                memDC->SetPen( wxPen( "red", 4, wxSOLID) );
-                memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE);
-
-                memDC->SetLogicalFunction(wxCOPY);
-
-                memDC->SetPen( wxPen( "black", 4, wxSOLID) );
-                memDC->SetBrush( *brush36 );
-                memDC->SetTextBackground(*wxBLACK);            // 0s --> 0x000000 (black)
-                memDC->SetTextForeground(*wxWHITE);    // 1s --> 0xFFFFFF (white)
-                memDC->SetLogicalFunction(wxAND_INVERT);
-
-                memDC->DrawRectangle( 10,10, 200, 200 );
-
-                // Set background and foreground colors for fill pattern
-                //the previous blacked out pixels are now merged with the layer color
-                //while the non blacked out pixels stay as they are.
-                memDC->SetTextBackground(*wxBLACK);            // 0s --> 0x000000 (black)
-                //now define what will be the color of the fillpattern parts that are not transparent
-                memDC->SetTextForeground(m_owner->m_colourBackground);
-                memDC->SetLogicalFunction(wxOR);
-
-                //don't understand how but the outline is also depending on logicalfunction
-                memDC->SetPen( wxPen( "yellow", 4, wxSOLID) );
-                memDC->DrawRectangle( 10, 10, 200, 200 );
-
-                memDC->SetBrush(wxNullBrush);
-                memDC->SetPen(wxNullPen);
-                dc.Blit(x,y,600,400,memDC,0,0,wxCOPY);
-                delete bmpBlit;
-                delete memDC;
-            }
-    }
+    static const wxCoord WIDTH = 200;
+    static const wxCoord HEIGHT = 80;
+
+    wxCoord x = 10,
+            y = 10;
+
+    dc.SetBrush(wxBrush(*wxGREEN, wxSOLID));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText(_T("Solid green"), x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*wxRED, wxCROSSDIAG_HATCH));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText(_T("Hatched red"), x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*gs_bmpMask));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText(_T("Stipple mono"), x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*gs_bmpNoMask));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText(_T("Stipple colour"), x + 10, y + 10);
+}
 
-    delete brush4;
-    delete brush36;
+void MyCanvas::DrawTestPoly(wxDC& dc)
+{
+    wxBrush brushHatch(*wxRED, wxFDIAGONAL_HATCH);
+    dc.SetBrush(brushHatch);
+
+    wxPoint star[5];
+    star[0] = wxPoint(100, 60);
+    star[1] = wxPoint(60, 150);
+    star[2] = wxPoint(160, 100);
+    star[3] = wxPoint(40, 100);
+    star[4] = wxPoint(140, 150);
+
+    dc.DrawText(_T("You should see two (irregular) stars below, the left one ")
+                _T("hatched"), 10, 10);
+    dc.DrawText(_T("except for the central region and the right ")
+                _T("one entirely hatched"), 10, 30);
+    dc.DrawText(_T("The third star only has a hatched outline"), 10, 50);
+
+    dc.DrawPolygon(WXSIZEOF(star), star, 0, 30);
+    dc.DrawPolygon(WXSIZEOF(star), star, 160, 30, wxWINDING_RULE);
+
+    wxPoint star2[10];
+    star2[0] = wxPoint(0, 100);
+    star2[1] = wxPoint(-59, -81);
+    star2[2] = wxPoint(95, 31);
+    star2[3] = wxPoint(-95, 31);
+    star2[4] = wxPoint(59, -81);
+    star2[5] = wxPoint(0, 80);
+    star2[6] = wxPoint(-47, -64);
+    star2[7] = wxPoint(76, 24);
+    star2[8] = wxPoint(-76, 24);
+    star2[9] = wxPoint(47, -64);
+    int count[2] = {5, 5};
+
+    dc.DrawPolyPolygon(WXSIZEOF(count), count, star2, 450, 150);
 }
 
 void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
 {
-    dc.SetPen( wxPen( "black", width, wxSOLID) );
+    dc.SetPen( wxPen( wxT("black"), width, wxSOLID) );
     dc.SetBrush( *wxRED_BRUSH );
+    dc.DrawText(wxString::Format(wxT("Testing lines of width %d"), width), x + 10, y - 10);
     dc.DrawRectangle( x+10, y+10, 100, 190 );
 
-    dc.SetPen( wxPen( "black", width, wxSOLID) );
+    dc.DrawText(_T("Solid/dot/short dash/long dash/dot dash"), x + 150, y + 10);
+    dc.SetPen( wxPen( wxT("black"), width, wxSOLID) );
     dc.DrawLine( x+20, y+20, 100, y+20 );
-    dc.SetPen( wxPen( "black", width, wxDOT) );
+    dc.SetPen( wxPen( wxT("black"), width, wxDOT) );
     dc.DrawLine( x+20, y+30, 100, y+30 );
-    dc.SetPen( wxPen( "black", width, wxSHORT_DASH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxSHORT_DASH) );
     dc.DrawLine( x+20, y+40, 100, y+40 );
-    dc.SetPen( wxPen( "black", width, wxLONG_DASH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxLONG_DASH) );
     dc.DrawLine( x+20, y+50, 100, y+50 );
-    dc.SetPen( wxPen( "black", width, wxDOT_DASH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxDOT_DASH) );
     dc.DrawLine( x+20, y+60, 100, y+60 );
 
-    dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) );
+    dc.DrawText(_T("Misc hatches"), x + 150, y + 70);
+    dc.SetPen( wxPen( wxT("black"), width, wxBDIAGONAL_HATCH) );
     dc.DrawLine( x+20, y+70, 100, y+70 );
-    dc.SetPen( wxPen( "black", width, wxCROSSDIAG_HATCH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxCROSSDIAG_HATCH) );
     dc.DrawLine( x+20, y+80, 100, y+80 );
-    dc.SetPen( wxPen( "black", width, wxFDIAGONAL_HATCH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxFDIAGONAL_HATCH) );
     dc.DrawLine( x+20, y+90, 100, y+90 );
-    dc.SetPen( wxPen( "black", width, wxCROSS_HATCH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxCROSS_HATCH) );
     dc.DrawLine( x+20, y+100, 100, y+100 );
-    dc.SetPen( wxPen( "black", width, wxHORIZONTAL_HATCH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxHORIZONTAL_HATCH) );
     dc.DrawLine( x+20, y+110, 100, y+110 );
-    dc.SetPen( wxPen( "black", width, wxVERTICAL_HATCH) );
+    dc.SetPen( wxPen( wxT("black"), width, wxVERTICAL_HATCH) );
     dc.DrawLine( x+20, y+120, 100, y+120 );
 
-    wxPen ud( "black", width, wxUSER_DASH );
-    wxDash dash1[1];
-    dash1[0] = 0;
-    ud.SetDashes( 1, dash1 );
+    dc.DrawText(_T("User dash"), x + 150, y + 140);
+    wxPen ud( wxT("black"), width, wxUSER_DASH );
+    wxDash dash1[6];
+    dash1[0] = 8;  // Long dash  <---------+
+    dash1[1] = 2;  // Short gap            |
+    dash1[2] = 3;  // Short dash           |
+    dash1[3] = 2;  // Short gap            |
+    dash1[4] = 3;  // Short dash           |
+    dash1[5] = 2;  // Short gap and repeat +
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );
     dc.DrawLine( x+20, y+140, 100, y+140 );
-    dash1[0] = 1;
-    ud.SetDashes( 1, dash1 );
+    dash1[0] = 5;  // Make first dash shorter
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );
     dc.DrawLine( x+20, y+150, 100, y+150 );
-    dash1[0] = 2;
-    ud.SetDashes( 1, dash1 );
+    dash1[2] = 5;  // Make second dash longer
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );
     dc.DrawLine( x+20, y+160, 100, y+160 );
-    dash1[0] = 0xFF;
-    ud.SetDashes( 1, dash1 );
+    dash1[4] = 5;  // Make third dash longer
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );
     dc.DrawLine( x+20, y+170, 100, y+170 );
 }
 
@@ -567,40 +515,41 @@ void MyCanvas::DrawDefault(wxDC& dc)
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);
-#if !(defined __WXGTK__) && !(defined __WXMOTIF__)
-    // not implemented in wxGTK or wxMOTIF :-(
-    dc.FloodFill(0, 0, wxColour(255, 0, 0));
-#endif //
 
-    dc.DrawIcon( wxICON(mondrian), 40, 40 );
+#if !wxMAC_USE_CORE_GRAPHICS
+    // GetPixel and FloodFill not supported by Mac OS X CoreGraphics
+    // (FloodFill uses Blit from a non-wxMemoryDC)
+    //flood fill using brush, starting at 1,1 and replacing whatever colour we find there
+    dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID));
+
+    wxColour tmpColour ;
+    dc.GetPixel(1,1, &tmpColour);
+    dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE);
+#endif
 
     dc.DrawCheckMark(5, 80, 15, 15);
     dc.DrawCheckMark(25, 80, 30, 30);
     dc.DrawCheckMark(60, 80, 60, 60);
 
-    // this is the test for "blitting bitmap into DC damages selected brush"
-    // bug
-    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
-    wxCoord rectSize = icon.GetWidth() + 10;
+    // this is the test for "blitting bitmap into DC damages selected brush" bug
+    wxCoord rectSize = m_std_icon.GetWidth() + 10;
     wxCoord x = 100;
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush( *wxGREEN_BRUSH );
     dc.DrawRectangle(x, 10, rectSize, rectSize);
-    dc.DrawBitmap(icon, x + 5, 15, TRUE);
+    dc.DrawBitmap(m_std_icon, x + 5, 15, true);
     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);
-    dc.DrawIcon(wxTheApp->GetStdIcon(wxICON_INFORMATION), x + 5, 15);
+    dc.DrawIcon(m_std_icon, x + 5, 15);
     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);
 
     // test for "transparent" bitmap drawing (it intersects with the last
     // rectangle above)
     //dc.SetBrush( *wxTRANSPARENT_BRUSH );
-    #include "../image/smile.xpm"
-    wxBitmap bmp(smile_xpm);
 
-    if (bmp.Ok())
-        dc.DrawBitmap(bmp, x + rectSize - 20, rectSize - 10, TRUE);
+    if (m_smile_bmp.Ok())
+        dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true);
 
     dc.SetBrush( *wxBLACK_BRUSH );
     dc.DrawRectangle( 0, 160, 1000, 300 );
@@ -616,7 +565,6 @@ void MyCanvas::DrawDefault(wxDC& dc)
 
     // to the right
     wxPen pen = *wxRED_PEN;
-    pen.SetWidth(2);
     memdc.SetPen(pen);
     memdc.DrawLine( 10, 5,10, 5 );
     memdc.DrawLine( 10,10,11,10 );
@@ -653,9 +601,9 @@ void MyCanvas::DrawDefault(wxDC& dc)
 
     memdc.SelectObject( wxNullBitmap );
     dc.DrawBitmap( bitmap, 10, 170 );
-    wxImage image( bitmap );
+    wxImage image = bitmap.ConvertToImage();
     image.Rescale( 60,210 );
-    bitmap = image.ConvertToBitmap();
+    bitmap = wxBitmap(image);
     dc.DrawBitmap( bitmap, 50, 170 );
 
     // test the rectangle outline drawing - there should be one pixel between
@@ -678,6 +626,21 @@ void MyCanvas::DrawDefault(wxDC& dc)
     dc.DrawLine(400, 170, 400, 210);
     dc.DrawLine(300, 200, 410, 200);
 
+    // a few more tests of this kind
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle(300, 220, 1, 1);
+    dc.DrawRectangle(310, 220, 2, 2);
+    dc.DrawRectangle(320, 220, 3, 3);
+    dc.DrawRectangle(330, 220, 4, 4);
+
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle(300, 230, 1, 1);
+    dc.DrawRectangle(310, 230, 2, 2);
+    dc.DrawRectangle(320, 230, 3, 3);
+    dc.DrawRectangle(330, 230, 4, 4);
+
     // and now for filled rect with outline
     dc.SetPen(*wxRED_PEN);
     dc.SetBrush( *wxWHITE_BRUSH );
@@ -709,7 +672,7 @@ void MyCanvas::DrawDefault(wxDC& dc)
 
     // Added by JACS to demonstrate bizarre behaviour.
     // With a size of 70, we get a missing red RHS,
-    // and the hight is too small, so we get yellow
+    // and the height is too small, so we get yellow
     // showing. With a size of 40, it draws as expected:
     // it just shows a white rectangle with red outline.
     int totalWidth = 70;
@@ -719,11 +682,12 @@ void MyCanvas::DrawDefault(wxDC& dc)
     wxMemoryDC memdc2;
     memdc2.SelectObject(bitmap2);
 
-    wxBrush yellowBrush(wxColour(255, 255, 0), wxSOLID);
+    wxColour clr(255, 255, 0);
+    wxBrush yellowBrush(clr, wxSOLID);
     memdc2.SetBackground(yellowBrush);
     memdc2.Clear();
 
-    wxPen yellowPen(wxColour(255, 255, 0), 1, wxSOLID);
+    wxPen yellowPen(clr, 1, wxSOLID);
 
     // Now draw a white rectangle with red outline. It should
     // entirely eclipse the yellow background.
@@ -757,36 +721,56 @@ void MyCanvas::DrawDefault(wxDC& dc)
 void MyCanvas::DrawText(wxDC& dc)
 {
     // set underlined font for testing
-    dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) );
-    dc.DrawText( "This is text", 110, 10 );
-    dc.DrawRotatedText( "That is text", 20, 10, -45 );
+    dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, true) );
+    dc.DrawText( _T("This is text"), 110, 10 );
+    dc.DrawRotatedText( _T("That is text"), 20, 10, -45 );
 
-    dc.SetFont( *wxNORMAL_FONT );
+    // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated
+    // under Win9x (it is not TrueType)
+    dc.SetFont( *wxSWISS_FONT );
 
     wxString text;
-    dc. SetBackgroundMode(wxTRANSPARENT);
+    dc.SetBackgroundMode(wxTRANSPARENT);
 
     for ( int n = -180; n < 180; n += 30 )
     {
-        text.Printf("     %d rotated text", n);
+        text.Printf(wxT("     %d rotated text"), n);
         dc.DrawRotatedText(text , 400, 400, n);
     }
 
     dc.SetFont( wxFont( 18, wxSWISS, wxNORMAL, wxNORMAL ) );
 
-    dc.DrawText( "This is Swiss 18pt text.", 110, 40 );
+    dc.DrawText( _T("This is Swiss 18pt text."), 110, 40 );
 
     long length;
     long height;
     long descent;
-    dc.GetTextExtent( "This is Swiss 18pt text.", &length, &height, &descent );
-    text.Printf( "Dimensions are length %ld, height %ld, descent %ld", length, height, descent );
+    dc.GetTextExtent( _T("This is Swiss 18pt text."), &length, &height, &descent );
+    text.Printf( wxT("Dimensions are length %ld, height %ld, descent %ld"), length, height, descent );
     dc.DrawText( text, 110, 80 );
 
-    text.Printf( "CharHeight() returns: %d", dc.GetCharHeight() );
+    text.Printf( wxT("CharHeight() returns: %d"), dc.GetCharHeight() );
     dc.DrawText( text, 110, 120 );
 
     dc.DrawRectangle( 100, 40, 4, height );
+
+    // test the logical function effect
+    wxCoord y = 150;
+    dc.SetLogicalFunction(wxINVERT);
+    dc.DrawText( _T("There should be no text below"), 110, 150 );
+    dc.DrawRectangle( 110, y, 100, height );
+
+    // twice drawn inverted should result in invisible
+    y += height;
+    dc.DrawText( _T("Invisible text"), 110, y );
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.DrawText( _T("Invisible text"), 110, y );
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.SetLogicalFunction(wxCOPY);
+
+    y += height;
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.DrawText( _T("Visible text"), 110, y );
 }
 
 static const struct
@@ -795,36 +779,36 @@ static const struct
     int           rop;
 } rasterOperations[] =
 {
-    { "wxAND",          wxAND           },
-    { "wxAND_INVERT",   wxAND_INVERT    },
-    { "wxAND_REVERSE",  wxAND_REVERSE   },
-    { "wxCLEAR",        wxCLEAR         },
-    { "wxCOPY",         wxCOPY          },
-    { "wxEQUIV",        wxEQUIV         },
-    { "wxINVERT",       wxINVERT        },
-    { "wxNAND",         wxNAND          },
-    { "wxNO_OP",        wxNO_OP         },
-    { "wxOR",           wxOR            },
-    { "wxOR_INVERT",    wxOR_INVERT     },
-    { "wxOR_REVERSE",   wxOR_REVERSE    },
-    { "wxSET",          wxSET           },
-    { "wxSRC_INVERT",   wxSRC_INVERT    },
-    { "wxXOR",          wxXOR           },
+    { wxT("wxAND"),          wxAND           },
+    { wxT("wxAND_INVERT"),   wxAND_INVERT    },
+    { wxT("wxAND_REVERSE"),  wxAND_REVERSE   },
+    { wxT("wxCLEAR"),        wxCLEAR         },
+    { wxT("wxCOPY"),         wxCOPY          },
+    { wxT("wxEQUIV"),        wxEQUIV         },
+    { wxT("wxINVERT"),       wxINVERT        },
+    { wxT("wxNAND"),         wxNAND          },
+    { wxT("wxNO_OP"),        wxNO_OP         },
+    { wxT("wxOR"),           wxOR            },
+    { wxT("wxOR_INVERT"),    wxOR_INVERT     },
+    { wxT("wxOR_REVERSE"),   wxOR_REVERSE    },
+    { wxT("wxSET"),          wxSET           },
+    { wxT("wxSRC_INVERT"),   wxSRC_INVERT    },
+    { wxT("wxXOR"),          wxXOR           },
 };
 
 void MyCanvas::DrawImages(wxDC& dc)
 {
-    dc.DrawText("original image", 0, 0);
-    dc.DrawBitmap(gs_bmpNoMask, 0, 20, 0);
-    dc.DrawText("with colour mask", 0, 100);
-    dc.DrawBitmap(gs_bmpWithColMask, 0, 120, TRUE);
-    dc.DrawText("the mask image", 0, 200);
-    dc.DrawBitmap(gs_bmpMask, 0, 220, 0);
-    dc.DrawText("masked image", 0, 300);
-    dc.DrawBitmap(gs_bmpWithMask, 0, 320, TRUE);
-
-    int cx = gs_bmpWithColMask.GetWidth(),
-        cy = gs_bmpWithColMask.GetHeight();
+    dc.DrawText(_T("original image"), 0, 0);
+    dc.DrawBitmap(*gs_bmpNoMask, 0, 20, 0);
+    dc.DrawText(_T("with colour mask"), 0, 100);
+    dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, true);
+    dc.DrawText(_T("the mask image"), 0, 200);
+    dc.DrawBitmap(*gs_bmpMask, 0, 220, 0);
+    dc.DrawText(_T("masked image"), 0, 300);
+    dc.DrawBitmap(*gs_bmpWithMask, 0, 320, true);
+
+    int cx = gs_bmpWithColMask->GetWidth(),
+        cy = gs_bmpWithColMask->GetHeight();
 
     wxMemoryDC memDC;
     for ( size_t n = 0; n < WXSIZEOF(rasterOperations); n++ )
@@ -833,8 +817,8 @@ void MyCanvas::DrawImages(wxDC& dc)
                 y =  20 + 100*(n/4);
 
         dc.DrawText(rasterOperations[n].name, x, y - 20);
-        memDC.SelectObject(gs_bmpWithColMask);
-        dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, TRUE);
+        memDC.SelectObject(*gs_bmpWithColMask);
+        dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, true);
     }
 }
 
@@ -874,10 +858,184 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
     }
 }
 
+void MyCanvas::DrawCircles(wxDC& dc)
+{
+    int x = 100,
+        y = 100,
+        r = 20;
+
+    dc.DrawText(_T("Some circles"), 0, y);
+    dc.DrawCircle(x, y, r);
+    dc.DrawCircle(x + 2*r, y, r);
+    dc.DrawCircle(x + 4*r, y, r);
+
+    y += 2*r;
+    dc.DrawText(_T("And ellipses"), 0, y);
+    dc.DrawEllipse(x - r, y, 2*r, r);
+    dc.DrawEllipse(x + r, y, 2*r, r);
+    dc.DrawEllipse(x + 3*r, y, 2*r, r);
+
+    y += 2*r;
+    dc.DrawText(_T("And arcs"), 0, y);
+    dc.DrawArc(x - r, y, x + r, y, x, y);
+    dc.DrawArc(x + 4*r, y, x + 2*r, y, x + 3*r, y);
+    dc.DrawArc(x + 5*r, y, x + 5*r, y, x + 6*r, y);
+
+    y += 2*r;
+    dc.DrawEllipticArc(x - r, y, 2*r, r, 0, 90);
+    dc.DrawEllipticArc(x + r, y, 2*r, r, 90, 180);
+    dc.DrawEllipticArc(x + 3*r, y, 2*r, r, 180, 270);
+    dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360);
+}
+
+void MyCanvas::DrawSplines(wxDC& dc)
+{
+#if wxUSE_SPLINES
+    dc.DrawText(_T("Some splines"), 10, 5);
+
+    // values are hardcoded rather than randomly generated
+    // so the output can be compared between native
+    // implementations on platforms with different random
+    // generators
+
+    const int R = 300;
+    const wxPoint center( R + 20, R + 20 );
+    const int angles[7] = { 0, 10, 33, 77, 13, 145, 90 };
+    const int radii[5] = { 100 , 59, 85, 33, 90 };
+    const int n = 200;
+    wxPoint pts[n];
+
+    // background spline calculation
+    unsigned int radius_pos = 0;
+    unsigned int angle_pos = 0;
+    int angle = 0;
+    for ( int i = 0; i < n; i++ )
+    {
+        angle += angles[ angle_pos ];
+        int r = R * radii[ radius_pos ] / 100;
+        pts[ i ].x = center.x + (wxCoord)( r * cos( M_PI * angle / 180.0) );
+        pts[ i ].y = center.y + (wxCoord)( r * sin( M_PI * angle / 180.0) );
+
+        angle_pos++;
+        if ( angle_pos >= WXSIZEOF(angles) ) angle_pos = 0;
+
+        radius_pos++;
+        if ( radius_pos >= WXSIZEOF(radii) ) radius_pos = 0;
+    }
+
+    // background spline drawing
+    dc.SetPen(*wxRED_PEN);
+    dc.DrawSpline(WXSIZEOF(pts), pts);
+
+    // less detailed spline calculation
+    wxPoint letters[4][5];
+    // w
+    letters[0][0] = wxPoint( 0,1); //  O           O
+    letters[0][1] = wxPoint( 1,3); //   *         *
+    letters[0][2] = wxPoint( 2,2); //    *   O   *
+    letters[0][3] = wxPoint( 3,3); //     * * * *
+    letters[0][4] = wxPoint( 4,1); //      O   O
+    // x1
+    letters[1][0] = wxPoint( 5,1); //  O*O
+    letters[1][1] = wxPoint( 6,1); //     *
+    letters[1][2] = wxPoint( 7,2); //      O
+    letters[1][3] = wxPoint( 8,3); //       *
+    letters[1][4] = wxPoint( 9,3); //        O*O
+    // x2
+    letters[2][0] = wxPoint( 5,3); //        O*O
+    letters[2][1] = wxPoint( 6,3); //       *
+    letters[2][2] = wxPoint( 7,2); //      O
+    letters[2][3] = wxPoint( 8,1); //     *
+    letters[2][4] = wxPoint( 9,1); //  O*O
+    // W
+    letters[3][0] = wxPoint(10,0); //  O           O
+    letters[3][1] = wxPoint(11,3); //   *         *
+    letters[3][2] = wxPoint(12,1); //    *   O   *
+    letters[3][3] = wxPoint(13,3); //     * * * *
+    letters[3][4] = wxPoint(14,0); //      O   O
+
+    const int dx = 2 * R / letters[3][4].x;
+    const int h[4] = { -R/2, 0, R/4, R/2 };
+
+    for ( int m = 0; m < 4; m++ )
+    {
+        for ( int n = 0; n < 5; n++ )
+        {
+            letters[m][n].x = center.x - R + letters[m][n].x * dx;
+            letters[m][n].y = center.y + h[ letters[m][n].y ];
+        }
+
+        dc.SetPen( wxPen( wxT("blue"), 1, wxDOT) );
+        dc.DrawLines(5, letters[m]);
+        dc.SetPen( wxPen( wxT("black"), 4, wxSOLID) );
+        dc.DrawSpline(5, letters[m]);
+    }
+
+#else
+    dc.DrawText(_T("Splines not supported."), 10, 5);
+#endif
+}
+
+void MyCanvas::DrawRegions(wxDC& dc)
+{
+    dc.DrawText(_T("You should see a red rect partly covered by a cyan one ")
+                _T("on the left"), 10, 5);
+    dc.DrawText(_T("and 5 smileys from which 4 are partially clipped on the right"),
+                10, 5 + dc.GetCharHeight());
+    dc.DrawText(_T("The second copy should be identical but right part of it ")
+                _T("should be offset by 10 pixels."),
+                10, 5 + 2*dc.GetCharHeight());
+
+    DrawRegionsHelper(dc, 10, true);
+    DrawRegionsHelper(dc, 350, false);
+}
+
+void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime)
+{
+    wxCoord y = 100;
+
+    dc.DestroyClippingRegion();
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle( x, y, 310, 310 );
+
+    dc.SetClippingRegion( x + 10, y + 10, 100, 270 );
+
+    dc.SetBrush( *wxRED_BRUSH );
+    dc.DrawRectangle( x, y, 310, 310 );
+
+    dc.SetClippingRegion( x + 10, y + 10, 100, 100 );
+
+    dc.SetBrush( *wxCYAN_BRUSH );
+    dc.DrawRectangle( x, y, 310, 310 );
+
+    dc.DestroyClippingRegion();
+
+    wxRegion region(x + 110, y + 20, 100, 270);
+#if !defined(__WXMOTIF__) && !defined(__WXMAC__)
+    if ( !firstTime )
+        region.Offset(10, 10);
+#endif
+    dc.SetClippingRegion(region);
+
+    dc.SetBrush( *wxGREY_BRUSH );
+    dc.DrawRectangle( x, y, 310, 310 );
+
+    if (m_smile_bmp.Ok())
+    {
+        dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true );
+        dc.DrawBitmap( m_smile_bmp, x + 130, y + 10,  true );
+        dc.DrawBitmap( m_smile_bmp, x + 130, y + 280, true );
+        dc.DrawBitmap( m_smile_bmp, x + 100, y + 70,  true );
+        dc.DrawBitmap( m_smile_bmp, x + 200, y + 70,  true );
+    }
+}
+
 void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxPaintDC dc(this);
     PrepareDC(dc);
+
     m_owner->PrepareDC(dc);
 
     dc.SetBackgroundMode( m_owner->m_backgroundMode );
@@ -890,16 +1048,21 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 
     if ( m_owner->m_textureBackground) {
         if ( ! m_owner->m_backgroundBrush.Ok() ) {
-            wxBrush b(wxColour(0,128,0), wxSOLID);
+            wxColour clr(0,128,0);
+            wxBrush b(clr, wxSOLID);
             dc.SetBackground(b);
         }
     }
 
+    if ( m_clip )
+        dc.SetClippingRegion(100, 100, 100, 100);
+
     dc.Clear();
 
-    if ( m_owner->m_textureBackground) {
+    if ( m_owner->m_textureBackground )
+    {
         dc.SetPen(*wxMEDIUM_GREY_PEN);
-        for (int i=0; i<200; i++)
+        for ( int i = 0; i < 200; i++ )
             dc.DrawLine(0, i*10, i*10, 0);
     }
 
@@ -909,21 +1072,35 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
             DrawDefault(dc);
             break;
 
+        case Show_Circles:
+            DrawCircles(dc);
+            break;
+
+        case Show_Splines:
+            DrawSplines(dc);
+            break;
+
+        case Show_Regions:
+            DrawRegions(dc);
+            break;
+
         case Show_Text:
             DrawText(dc);
             break;
 
         case Show_Lines:
             DrawTestLines( 0, 100, 0, dc );
-            DrawTestLines( 0, 300, 1, dc );
-            DrawTestLines( 0, 500, 2, dc );
-            DrawTestLines( 0, 700, 6, dc );
+            DrawTestLines( 0, 320, 1, dc );
+            DrawTestLines( 0, 540, 2, dc );
+            DrawTestLines( 0, 760, 6, dc );
+            break;
+
+        case Show_Brushes:
+            DrawTestBrushes(dc);
             break;
 
         case Show_Polygons:
-            DrawTestPoly( 0,  100, dc, 0 );
-            DrawTestPoly( 33, 500, dc, 1 );
-            DrawTestPoly( 43, 1000, dc, 2 );
+            DrawTestPoly(dc);
             break;
 
         case Show_Mask:
@@ -938,6 +1115,7 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 
 void MyCanvas::OnMouseMove(wxMouseEvent &event)
 {
+#if wxUSE_STATUSBAR
     wxClientDC dc(this);
     PrepareDC(dc);
     m_owner->PrepareDC(dc);
@@ -946,20 +1124,24 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event)
     long x = dc.DeviceToLogicalX( pos.x );
     long y = dc.DeviceToLogicalY( pos.y );
     wxString str;
-    str.Printf( "Current mouse position: %d,%d", (int)x, (int)y );
+    str.Printf( wxT("Current mouse position: %d,%d"), (int)x, (int)y );
     m_owner->SetStatusText( str );
+#else
+    wxUnusedVar(event);
+#endif // wxUSE_STATUSBAR
 }
 
 // ----------------------------------------------------------------------------
 // MyFrame
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU      (File_Quit,     MyFrame::OnQuit)
     EVT_MENU      (File_About,    MyFrame::OnAbout)
+    EVT_MENU      (File_Clip,     MyFrame::OnClip)
 
     EVT_MENU_RANGE(MenuShow_First,   MenuShow_Last,   MyFrame::OnShow)
 
@@ -968,70 +1150,83 @@ END_EVENT_TABLE()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size,
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
 {
     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     wxMenu *menuFile = new wxMenu;
-    menuFile->Append(File_ShowDefault, "&Default screen\tF1");
-    menuFile->Append(File_ShowText, "&Text screen\tF2");
-    menuFile->Append(File_ShowLines, "&Lines screen\tF3");
-    menuFile->Append(File_ShowPolygons, "&Polygons screen\tF4");
-    menuFile->Append(File_ShowMask, "wx&Mask screen\tF5");
-    menuFile->Append(File_ShowOps, "&ROP screen\tF6");
+    menuFile->Append(File_ShowDefault, _T("&Default screen\tF1"));
+    menuFile->Append(File_ShowText, _T("&Text screen\tF2"));
+    menuFile->Append(File_ShowLines, _T("&Lines screen\tF3"));
+    menuFile->Append(File_ShowBrushes, _T("&Brushes screen\tF4"));
+    menuFile->Append(File_ShowPolygons, _T("&Polygons screen\tF5"));
+    menuFile->Append(File_ShowMask, _T("&Mask screen\tF6"));
+    menuFile->Append(File_ShowOps, _T("&ROP screen\tF7"));
+    menuFile->Append(File_ShowRegions, _T("Re&gions screen\tF8"));
+    menuFile->Append(File_ShowCircles, _T("&Circles screen\tF9"));
+    menuFile->Append(File_ShowSplines, _T("&Splines screen"));
     menuFile->AppendSeparator();
-    menuFile->Append(File_About, "&About...\tCtrl-A", "Show about dialog");
+    menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing"));
     menuFile->AppendSeparator();
-    menuFile->Append(File_Quit, "E&xit\tAlt-X", "Quit this program");
+    menuFile->Append(File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
+    menuFile->AppendSeparator();
+    menuFile->Append(File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     wxMenu *menuMapMode = new wxMenu;
-    menuMapMode->Append( MapMode_Text, "&TEXT map mode" );
-    menuMapMode->Append( MapMode_Lometric, "&LOMETRIC map mode" );
-    menuMapMode->Append( MapMode_Twips, "T&WIPS map mode" );
-    menuMapMode->Append( MapMode_Points, "&POINTS map mode" );
-    menuMapMode->Append( MapMode_Metric, "&METRIC map mode" );
+    menuMapMode->Append( MapMode_Text, _T("&TEXT map mode") );
+    menuMapMode->Append( MapMode_Lometric, _T("&LOMETRIC map mode") );
+    menuMapMode->Append( MapMode_Twips, _T("T&WIPS map mode") );
+    menuMapMode->Append( MapMode_Points, _T("&POINTS map mode") );
+    menuMapMode->Append( MapMode_Metric, _T("&METRIC map mode") );
 
     wxMenu *menuUserScale = new wxMenu;
-    menuUserScale->Append( UserScale_StretchHoriz, "Stretch horizontally\tCtrl-H" );
-    menuUserScale->Append( UserScale_ShrinkHoriz, "Shrink  horizontally\tCtrl-G" );
-    menuUserScale->Append( UserScale_StretchVertic, "Stretch vertically\tCtrl-V" );
-    menuUserScale->Append( UserScale_ShrinkVertic, "Shrink vertically\tCtrl-W" );
+    menuUserScale->Append( UserScale_StretchHoriz, _T("Stretch &horizontally\tCtrl-H") );
+    menuUserScale->Append( UserScale_ShrinkHoriz, _T("Shrin&k horizontally\tCtrl-G") );
+    menuUserScale->Append( UserScale_StretchVertic, _T("Stretch &vertically\tCtrl-V") );
+    menuUserScale->Append( UserScale_ShrinkVertic, _T("&Shrink vertically\tCtrl-W") );
     menuUserScale->AppendSeparator();
-    menuUserScale->Append( UserScale_Restore, "Restore to normal\tCtrl-0" );
+    menuUserScale->Append( UserScale_Restore, _T("&Restore to normal\tCtrl-0") );
 
     wxMenu *menuAxis = new wxMenu;
-    menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE );
-    menuAxis->Append( AxisMirror_Vertic, "Mirror vertically\tCtrl-N", "", TRUE );
+    menuAxis->AppendCheckItem( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M") );
+    menuAxis->AppendCheckItem( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N") );
 
     wxMenu *menuLogical = new wxMenu;
-    menuLogical->Append( LogicalOrigin_MoveDown, "Move &down\tCtrl-D" );
-    menuLogical->Append( LogicalOrigin_MoveUp, "Move &up\tCtrl-U" );
-    menuLogical->Append( LogicalOrigin_MoveLeft, "Move &right\tCtrl-L" );
-    menuLogical->Append( LogicalOrigin_MoveRight, "Move &left\tCtrl-R" );
+    menuLogical->Append( LogicalOrigin_MoveDown, _T("Move &down\tCtrl-D") );
+    menuLogical->Append( LogicalOrigin_MoveUp, _T("Move &up\tCtrl-U") );
+    menuLogical->Append( LogicalOrigin_MoveLeft, _T("Move &right\tCtrl-L") );
+    menuLogical->Append( LogicalOrigin_MoveRight, _T("Move &left\tCtrl-R") );
+    menuLogical->AppendSeparator();
+    menuLogical->Append( LogicalOrigin_Set, _T("Set to (&100, 100)\tShift-Ctrl-1") );
+    menuLogical->Append( LogicalOrigin_Restore, _T("&Restore to normal\tShift-Ctrl-0") );
 
     wxMenu *menuColour = new wxMenu;
-    menuColour->Append( Colour_TextForeground, "Text foreground..." );
-    menuColour->Append( Colour_TextBackground, "Text background..." );
-    menuColour->Append( Colour_Background, "Background colour..." );
-    menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE );
-    menuColour->Append( Colour_TextureBackgound, "Draw textured background\tCtrl-T", "", TRUE);
+#if wxUSE_COLOURDLG
+    menuColour->Append( Colour_TextForeground, _T("Text &foreground...") );
+    menuColour->Append( Colour_TextBackground, _T("Text &background...") );
+    menuColour->Append( Colour_Background, _T("Background &colour...") );
+#endif // wxUSE_COLOURDLG
+    menuColour->AppendCheckItem( Colour_BackgroundMode, _T("&Opaque/transparent\tCtrl-B") );
+    menuColour->AppendCheckItem( Colour_TextureBackgound, _T("Draw textured back&ground\tCtrl-T") );
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, "&File");
-    menuBar->Append(menuMapMode, "&MapMode");
-    menuBar->Append(menuUserScale, "&UserScale");
-    menuBar->Append(menuAxis, "&Axis");
-    menuBar->Append(menuLogical, "&LogicalOrigin");
-    menuBar->Append(menuColour, "&Colours");
+    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(menuMapMode, _T("&Mode"));
+    menuBar->Append(menuUserScale, _T("&Scale"));
+    menuBar->Append(menuAxis, _T("&Axis"));
+    menuBar->Append(menuLogical, _T("&Origin"));
+    menuBar->Append(menuColour, _T("&Colours"));
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
-    // create a status bar just for fun (by default with 1 pane only)
+#if wxUSE_STATUSBAR
     CreateStatusBar(2);
-    SetStatusText("Welcome to wxWindows!");
+    SetStatusText(_T("Welcome to wxWidgets!"));
+#endif // wxUSE_STATUSBAR
 
     m_mapMode = wxMM_TEXT;
     m_xUserScale = 1.0;
@@ -1039,11 +1234,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_xLogicalOrigin = 0;
     m_yLogicalOrigin = 0;
     m_xAxisReversed =
-    m_yAxisReversed = FALSE;
+    m_yAxisReversed = false;
     m_backgroundMode = wxSOLID;
     m_colourForeground = *wxRED;
     m_colourBackground = *wxBLUE;
-    m_textureBackground = FALSE;
+    m_textureBackground = false;
 
     m_canvas = new MyCanvas( this );
     m_canvas->SetScrollbars( 10, 10, 100, 240 );
@@ -1053,28 +1248,35 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
-    msg.Printf( _T("This is the about dialog of the drawing sample.\n")
-                _T("Copyright (c) Robert Roebling 1999")
+    msg.Printf( wxT("This is the about dialog of the drawing sample.\n")
+                wxT("This sample tests various primitive drawing functions\n")
+                wxT("(without any attempts to prevent flicker).\n")
+                wxT("Copyright (c) Robert Roebling 1999")
               );
 
-    wxMessageBox(msg, "About Drawing", wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(msg, _T("About Drawing"), wxOK | wxICON_INFORMATION, this);
+}
+
+void MyFrame::OnClip(wxCommandEvent& event)
+{
+    m_canvas->Clip(event.IsChecked());
 }
 
 void MyFrame::OnShow(wxCommandEvent& event)
 {
-    m_canvas->Show((ScreenToShow)(event.GetInt() - MenuShow_First));
+    m_canvas->ToShow((ScreenToShow)(event.GetId() - MenuShow_First));
 }
 
 void MyFrame::OnOption(wxCommandEvent& event)
 {
-    switch (event.GetInt())
+    switch (event.GetId())
     {
         case MapMode_Text:
             m_mapMode = wxMM_TEXT;
@@ -1104,6 +1306,14 @@ void MyFrame::OnOption(wxCommandEvent& event)
         case LogicalOrigin_MoveRight:
             m_xLogicalOrigin -= 10;
             break;
+        case LogicalOrigin_Set:
+            m_xLogicalOrigin =
+            m_yLogicalOrigin = -100;
+            break;
+        case LogicalOrigin_Restore:
+            m_xLogicalOrigin =
+            m_yLogicalOrigin = 0;
+            break;
 
         case UserScale_StretchHoriz:
             m_xUserScale *= 1.10;
@@ -1129,6 +1339,7 @@ void MyFrame::OnOption(wxCommandEvent& event)
             m_xAxisReversed = !m_xAxisReversed;
             break;
 
+#if wxUSE_COLOURDLG
         case Colour_TextForeground:
             m_colourForeground = SelectColour();
             break;
@@ -1144,6 +1355,8 @@ void MyFrame::OnOption(wxCommandEvent& event)
                 }
             }
             break;
+#endif // wxUSE_COLOURDLG
+
         case Colour_BackgroundMode:
             m_backgroundMode = m_backgroundMode == wxSOLID ? wxTRANSPARENT
                                                            : wxSOLID;
@@ -1163,12 +1376,13 @@ void MyFrame::OnOption(wxCommandEvent& event)
 
 void MyFrame::PrepareDC(wxDC& dc)
 {
-    dc.SetMapMode( m_mapMode );
-    dc.SetUserScale( m_xUserScale, m_yUserScale );
     dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
     dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed );
+    dc.SetUserScale( m_xUserScale, m_yUserScale );
+    dc.SetMapMode( m_mapMode );
 }
 
+#if wxUSE_COLOURDLG
 wxColour MyFrame::SelectColour()
 {
     wxColour col;
@@ -1182,3 +1396,4 @@ wxColour MyFrame::SelectColour()
 
     return col;
 }
+#endif // wxUSE_COLOURDLG