show the resize cursor when the mouse is above the grip and not only when it's just...

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 0fe06ad96e1fb7b4583c36db4152772859ac5cc9..e08e04250d80e83474eb31184860f0767000fcfe 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -36,13 +36,14 @@
 #endif
 
 #include "wx/colordlg.h"
 #endif
 
 #include "wx/colordlg.h"

+#include "wx/image.h"

 
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 
 // the application icon
 
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -57,20 +58,25 @@ enum ScreenToShow
     Show_Default,
     Show_Text,
     Show_Lines,
     Show_Default,
     Show_Text,
     Show_Lines,

+    Show_Brushes,

     Show_Polygons,
     Show_Polygons,

-    Show_Mask
+    Show_Mask,
+    Show_Ops,
+    Show_Regions,
+    Show_Circles

 };
 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // 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
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -88,7 +94,11 @@ public:
     // return: if OnInit() returns false, the application terminates)
     virtual bool OnInit();
 
     // return: if OnInit() returns false, the application terminates)
     virtual bool OnInit();
 

+    virtual int OnExit() { DeleteBitmaps(); return 0; }
+

 protected:
 protected:

+    void DeleteBitmaps();
+

     bool LoadImages();
 };
 
     bool LoadImages();
 };
 


@@ -111,6 +121,7 @@ public:
     void PrepareDC(wxDC& dc);
 
     int         m_backgroundMode;
     void PrepareDC(wxDC& dc);
 
     int         m_backgroundMode;

+    int         m_textureBackground;

     int         m_mapMode;
     double      m_xUserScale;
     double      m_yUserScale;
     int         m_mapMode;
     double      m_xUserScale;
     double      m_yUserScale;


@@ -140,16 +151,24 @@ public:
     void Show(ScreenToShow show) { m_show = show; Refresh(); }
 
 protected:
     void Show(ScreenToShow show) { m_show = show; Refresh(); }
 
 protected:

-    void DrawTestPoly( int x, int y, wxDC &dc ,int transparent );

     void DrawTestLines( int x, int y, int width, wxDC &dc );
     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 DrawText(wxDC& dc);
     void DrawImages(wxDC& dc);

+    void DrawWithLogicalOps(wxDC& dc);
+    void DrawRegions(wxDC& dc);
+    void DrawCircles(wxDC& dc);

     void DrawDefault(wxDC& dc);
 
     void DrawDefault(wxDC& dc);
 

+    void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime);
+

 private:
     MyFrame *m_owner;
 
     ScreenToShow m_show;
 private:
     MyFrame *m_owner;
 
     ScreenToShow m_show;

+    wxBitmap     m_smile_bmp;
+    wxIcon       m_std_icon;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -169,9 +188,13 @@ enum
     File_ShowDefault = MenuShow_First,
     File_ShowText,
     File_ShowLines,
     File_ShowDefault = MenuShow_First,
     File_ShowText,
     File_ShowLines,

+    File_ShowBrushes,

     File_ShowPolygons,
     File_ShowMask,
     File_ShowPolygons,
     File_ShowMask,

-    MenuShow_Last = File_ShowMask,
+    File_ShowOps,
+    File_ShowRegions,
+    File_ShowCircles,
+    MenuShow_Last = File_ShowCircles,

 
     MenuOption_First,
 
 
     MenuOption_First,
 


@@ -194,13 +217,16 @@ enum
     LogicalOrigin_MoveUp,
     LogicalOrigin_MoveLeft,
     LogicalOrigin_MoveRight,
     LogicalOrigin_MoveUp,
     LogicalOrigin_MoveLeft,
     LogicalOrigin_MoveRight,

+    LogicalOrigin_Set,
+    LogicalOrigin_Restore,

 
     Colour_TextForeground,
     Colour_TextBackground,
     Colour_Background,
     Colour_BackgroundMode,
 
     Colour_TextForeground,
     Colour_TextBackground,
     Colour_Background,
     Colour_BackgroundMode,

+    Colour_TextureBackgound,

 
 

-    MenuOption_Last = Colour_BackgroundMode
+    MenuOption_Last = Colour_TextureBackgound

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -225,6 +251,14 @@ IMPLEMENT_APP(MyApp)
 
 bool MyApp::LoadImages()
 {
 
 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("..");
     wxPathList pathList;
     pathList.Add(".");
     pathList.Add("..");


@@ -232,35 +266,38 @@ bool MyApp::LoadImages()
     wxString path = pathList.FindValidPath("pat4.bmp");
     if ( !path )
         return FALSE;
     wxString path = pathList.FindValidPath("pat4.bmp");
     if ( !path )
         return FALSE;

-    gs_bmp4.LoadFile(path, wxBITMAP_TYPE_BMP);
-    wxMask* mask4 = new wxMask(gs_bmp4, *wxBLACK);
-    gs_bmp4.SetMask(mask4);
+
+    /* 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("pat36.bmp");
     if ( !path )
         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);
+    gs_bmp36->LoadFile(path, wxBITMAP_TYPE_BMP);
+    wxMask* mask36 = new wxMask(*gs_bmp36, *wxBLACK);
+    gs_bmp36->SetMask(mask36);

 
     path = pathList.FindValidPath("image.bmp");
     if ( !path )
         return FALSE;
 
     path = pathList.FindValidPath("image.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);
+    gs_bmpNoMask->LoadFile(path, wxBITMAP_TYPE_BMP);
+    gs_bmpWithMask->LoadFile(path, wxBITMAP_TYPE_BMP);
+    gs_bmpWithColMask->LoadFile(path, wxBITMAP_TYPE_BMP);

 
     path = pathList.FindValidPath("mask.bmp");
     if ( !path )
         return FALSE;
 
     path = pathList.FindValidPath("mask.bmp");
     if ( !path )
         return FALSE;

-    gs_bmpMask.LoadFile(path, wxBITMAP_TYPE_BMP);
-    gs_bmpMask.SetDepth(1);
+    gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP);

 
 

-    wxMask *mask = new wxMask(gs_bmpMask);
-    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;
 }


@@ -278,11 +315,13 @@ bool MyApp::OnInit()
 
     if ( !LoadImages() )
     {
 
     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
 
         // stop here

+        DeleteBitmaps();
+

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -290,6 +329,25 @@ bool MyApp::OnInit()
     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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // MyCanvas
 // ----------------------------------------------------------------------------


@@ -301,244 +359,102 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_MOTION (MyCanvas::OnMouseMove)
 END_EVENT_TABLE()
 
     EVT_MOTION (MyCanvas::OnMouseMove)
 END_EVENT_TABLE()
 

-MyCanvas::MyCanvas( MyFrame *parent ) : wxScrolledWindow( parent )
+#include "smile.xpm"
+
+MyCanvas::MyCanvas(MyFrame *parent)
+        : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
+                           wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE)

 {
     m_owner = parent;
     m_show = Show_Default;
 {
     m_owner = parent;
     m_show = Show_Default;

+    m_smile_bmp = wxBitmap(smile_xpm);
+    m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);

 }
 
 }
 

-//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("Solid green", x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*wxRED, wxCROSSDIAG_HATCH));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText("Hatched red", x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*gs_bmpMask));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText("Stipple mono", x + 10, y + 10);
+
+    y += HEIGHT;
+    dc.SetBrush(wxBrush(*gs_bmpNoMask));
+    dc.DrawRectangle(x, y, WIDTH, HEIGHT);
+    dc.DrawText("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("You should see two (irregular) stars below, the left one "
+                "hatched", 10, 10);
+    dc.DrawText("except for the central region and the right "
+                "one entirely hatched", 10, 30);
+
+    dc.DrawPolygon(WXSIZEOF(star), star);
+    dc.DrawPolygon(WXSIZEOF(star), star, 160, 0, wxWINDING_RULE);

 }
 
 void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
 {
 }
 
 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.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.DrawRectangle( x+10, y+10, 100, 190 );
 

-    dc.SetPen( wxPen( "black", width, wxSOLID) );
+    dc.DrawText("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.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.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.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.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.DrawLine( x+20, y+60, 100, y+60 );
 

-    dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) );
+    dc.DrawText("Misc hatches", x + 150, y + 70);
+    dc.SetPen( wxPen( wxT("black"), width, wxBDIAGONAL_HATCH) );

     dc.DrawLine( x+20, y+70, 100, y+70 );
     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.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.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.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.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 );
 
     dc.DrawLine( x+20, y+120, 100, y+120 );
 

-    wxPen ud( "black", width, wxUSER_DASH );
+    dc.DrawText("User dash", x + 150, y + 140);
+    wxPen ud( wxT("black"), width, wxUSER_DASH );

     wxDash dash1[1];
     dash1[0] = 0;
     ud.SetDashes( 1, dash1 );
     wxDash dash1[1];
     dash1[0] = 0;
     ud.SetDashes( 1, dash1 );


@@ -549,30 +465,208 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     dash1[0] = 2;
     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+160, 100, y+160 );
     dash1[0] = 2;
     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+160, 100, y+160 );

-    dash1[0] = 0xFF;
+    dash1[0] = 0x7F;

     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+170, 100, y+170 );
     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+170, 100, y+170 );

-

 }
 
 void MyCanvas::DrawDefault(wxDC& dc)
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);
 }
 
 void MyCanvas::DrawDefault(wxDC& dc)
 {
     // mark the origin
     dc.DrawCircle(0, 0, 10);

-#if !(defined __WXGTK__) && !(defined __WXMOTIF__)
+#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__)

     // not implemented in wxGTK or wxMOTIF :-(
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //
 
     // not implemented in wxGTK or wxMOTIF :-(
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //
 

-    dc.DrawIcon( wxICON(mondrian), 410, 40 );
+    dc.DrawCheckMark(5, 80, 15, 15);
+    dc.DrawCheckMark(25, 80, 30, 30);
+    dc.DrawCheckMark(60, 80, 60, 60);

 
 

-    // test the rectangle drawing - there should be no pixels between the rect
-    // and the lines
+    // 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.SetPen(*wxTRANSPARENT_PEN);

+    dc.SetBrush( *wxGREEN_BRUSH );
+    dc.DrawRectangle(x, 10, rectSize, rectSize);
+    dc.DrawBitmap(m_std_icon, x + 5, 15, TRUE);
+    x += rectSize + 10;
+    dc.DrawRectangle(x, 10, rectSize, rectSize);
+    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 );
+
+    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 );
+
+    // draw lines
+    wxBitmap bitmap(20,70);
+    wxMemoryDC memdc;
+    memdc.SelectObject( bitmap );
+    memdc.SetBrush( *wxBLACK_BRUSH );
+    memdc.SetPen( *wxWHITE_PEN );
+    memdc.DrawRectangle(0,0,20,70);
+    memdc.DrawLine( 10,0,10,70 );
+
+    // to the right
+    wxPen pen = *wxRED_PEN;
+    memdc.SetPen(pen);
+    memdc.DrawLine( 10, 5,10, 5 );
+    memdc.DrawLine( 10,10,11,10 );
+    memdc.DrawLine( 10,15,12,15 );
+    memdc.DrawLine( 10,20,13,20 );
+
+/*
+    memdc.SetPen(*wxRED_PEN);
+    memdc.DrawLine( 12, 5,12, 5 );
+    memdc.DrawLine( 12,10,13,10 );
+    memdc.DrawLine( 12,15,14,15 );
+    memdc.DrawLine( 12,20,15,20 );
+*/
+
+    // same to the left
+    memdc.DrawLine( 10,25,10,25 );
+    memdc.DrawLine( 10,30, 9,30 );
+    memdc.DrawLine( 10,35, 8,35 );
+    memdc.DrawLine( 10,40, 7,40 );
+
+    // XOR draw lines
+    dc.SetPen(*wxWHITE_PEN);
+    memdc.SetLogicalFunction( wxINVERT );
+    memdc.SetPen( *wxWHITE_PEN );
+    memdc.DrawLine( 10,50,10,50 );
+    memdc.DrawLine( 10,55,11,55 );
+    memdc.DrawLine( 10,60,12,60 );
+    memdc.DrawLine( 10,65,13,65 );
+
+    memdc.DrawLine( 12,50,12,50 );
+    memdc.DrawLine( 12,55,13,55 );
+    memdc.DrawLine( 12,60,14,60 );
+    memdc.DrawLine( 12,65,15,65 );
+
+    memdc.SelectObject( wxNullBitmap );
+    dc.DrawBitmap( bitmap, 10, 170 );
+    wxImage image( bitmap );
+    image.Rescale( 60,210 );
+    bitmap = image.ConvertToBitmap();
+    dc.DrawBitmap( bitmap, 50, 170 );
+
+    // test the rectangle outline drawing - there should be one pixel between
+    // the rect and the lines
+    dc.SetPen(*wxWHITE_PEN);
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    dc.DrawRectangle(150, 170, 49, 29);
+    dc.DrawRectangle(200, 170, 49, 29);
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(250, 210, 250, 170);
+    dc.DrawLine(260, 200, 150, 200);
+
+    // test the rectangle filled drawing - there should be one pixel between
+    // the rect and the lines
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRectangle(300, 170, 49, 29);

     dc.DrawRectangle(350, 170, 49, 29);
     dc.DrawRectangle(350, 170, 49, 29);

+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(400, 170, 400, 210);
+    dc.DrawLine(300, 200, 410, 200);
+
+    // a few more tests of this kind

     dc.SetPen(*wxRED_PEN);
     dc.SetPen(*wxRED_PEN);

-    dc.DrawLine(400, 160, 400, 210); 
-    dc.DrawLine(340, 200, 410, 200); 
+    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 );
+    dc.DrawRectangle(500, 170, 49, 29);
+    dc.DrawRectangle(550, 170, 49, 29);
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(600, 170, 600, 210);
+    dc.DrawLine(500, 200, 610, 200);
+
+    // test the rectangle outline drawing - there should be one pixel between
+    // the rect and the lines
+    dc.SetPen(*wxWHITE_PEN);
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+    dc.DrawRoundedRectangle(150, 270, 49, 29, 6);
+    dc.DrawRoundedRectangle(200, 270, 49, 29, 6);
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(250, 270, 250, 310);
+    dc.DrawLine(150, 300, 260, 300);
+
+    // test the rectangle filled drawing - there should be one pixel between
+    // the rect and the lines
+    dc.SetPen(*wxTRANSPARENT_PEN);
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.DrawRoundedRectangle(300, 270, 49, 29, 6);
+    dc.DrawRoundedRectangle(350, 270, 49, 29, 6);
+    dc.SetPen(*wxWHITE_PEN);
+    dc.DrawLine(400, 270, 400, 310);
+    dc.DrawLine(300, 300, 410, 300);
+
+    // 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
+    // showing. With a size of 40, it draws as expected:
+    // it just shows a white rectangle with red outline.
+    int totalWidth = 70;
+    int totalHeight = 70;
+    wxBitmap bitmap2(totalWidth, totalHeight);
+
+    wxMemoryDC memdc2;
+    memdc2.SelectObject(bitmap2);
+
+    wxBrush yellowBrush(wxColour(255, 255, 0), wxSOLID);
+    memdc2.SetBackground(yellowBrush);
+    memdc2.Clear();
+
+    wxPen yellowPen(wxColour(255, 255, 0), 1, wxSOLID);
+
+    // Now draw a white rectangle with red outline. It should
+    // entirely eclipse the yellow background.
+    memdc2.SetPen(*wxRED_PEN);
+    memdc2.SetBrush(*wxWHITE_BRUSH);
+
+    memdc2.DrawRectangle(0, 0, totalWidth, totalHeight);
+
+    memdc2.SetPen(wxNullPen);
+    memdc2.SetBrush(wxNullBrush);
+    memdc2.SelectObject(wxNullBitmap);
+
+    dc.DrawBitmap(bitmap2, 500, 270);
+
+    // Repeat, but draw directly on dc
+    // Draw a yellow rectangle filling the bitmap
+
+    x = 600; int y = 270;
+    dc.SetPen(yellowPen);
+    dc.SetBrush(yellowBrush);
+    dc.DrawRectangle(x, y, totalWidth, totalHeight);
+
+    // Now draw a white rectangle with red outline. It should
+    // entirely eclipse the yellow background.
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(*wxWHITE_BRUSH);
+
+    dc.DrawRectangle(x, y, totalWidth, totalHeight);

 }
 
 void MyCanvas::DrawText(wxDC& dc)
 }
 
 void MyCanvas::DrawText(wxDC& dc)


@@ -582,14 +676,16 @@ void MyCanvas::DrawText(wxDC& dc)
     dc.DrawText( "This is text", 110, 10 );
     dc.DrawRotatedText( "That is text", 20, 10, -45 );
 
     dc.DrawText( "This is text", 110, 10 );
     dc.DrawRotatedText( "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;
 
     wxString text;

-    dc. SetBackgroundMode(wxTRANSPARENT);
+    dc.SetBackgroundMode(wxTRANSPARENT);

 
     for ( int n = -180; n < 180; n += 30 )
     {
 
     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.DrawRotatedText(text , 400, 400, n);
     }
 


@@ -601,51 +697,69 @@ void MyCanvas::DrawText(wxDC& dc)
     long height;
     long descent;
     dc.GetTextExtent( "This is Swiss 18pt text.", &length, &height, &descent );
     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 );
+    text.Printf( wxT("Dimensions are length %ld, height %ld, descent %ld"), length, height, descent );

     dc.DrawText( text, 110, 80 );
 
     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 );
     dc.DrawText( text, 110, 120 );
 
     dc.DrawRectangle( 100, 40, 4, height );

+
+    // test the logical function effect
+    wxCoord y = 150;
+    dc.SetLogicalFunction(wxINVERT);
+    dc.DrawText( "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( "Invisible text", 110, y );
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.DrawText( "Invisible text", 110, y );
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.SetLogicalFunction(wxCOPY);
+
+    y += height;
+    dc.DrawRectangle( 110, y, 100, height );
+    dc.DrawText( "Visible text", 110, y );

 }
 
 }
 

-void MyCanvas::DrawImages(wxDC& dc)
+static const struct

 {
 {

-    static const struct
-    {
-        const wxChar *name;
-        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           },
-    };
+    const wxChar *name;
+    int           rop;
+} rasterOperations[] =
+{
+    { 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.DrawText("original image", 0, 0);

-    dc.DrawBitmap(gs_bmpNoMask, 0, 20, 0);
+    dc.DrawBitmap(*gs_bmpNoMask, 0, 20, 0);

     dc.DrawText("with colour mask", 0, 100);
     dc.DrawText("with colour mask", 0, 100);

-    dc.DrawBitmap(gs_bmpWithColMask, 0, 120, TRUE);
+    dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, TRUE);

     dc.DrawText("the mask image", 0, 200);
     dc.DrawText("the mask image", 0, 200);

-    dc.DrawBitmap(gs_bmpMask, 0, 220, 0);
+    dc.DrawBitmap(*gs_bmpMask, 0, 220, 0);

     dc.DrawText("masked image", 0, 300);
     dc.DrawText("masked image", 0, 300);

-    dc.DrawBitmap(gs_bmpWithMask, 0, 320, TRUE);
+    dc.DrawBitmap(*gs_bmpWithMask, 0, 320, TRUE);

 
 

-    int cx = gs_bmpWithColMask.GetWidth(),
-        cy = gs_bmpWithColMask.GetHeight();
+    int cx = gs_bmpWithColMask->GetWidth(),
+        cy = gs_bmpWithColMask->GetHeight();

 
     wxMemoryDC memDC;
     for ( size_t n = 0; n < WXSIZEOF(rasterOperations); n++ )
 
     wxMemoryDC memDC;
     for ( size_t n = 0; n < WXSIZEOF(rasterOperations); n++ )


@@ -654,15 +768,136 @@ void MyCanvas::DrawImages(wxDC& dc)
                 y =  20 + 100*(n/4);
 
         dc.DrawText(rasterOperations[n].name, x, y - 20);
                 y =  20 + 100*(n/4);
 
         dc.DrawText(rasterOperations[n].name, x, y - 20);

-        memDC.SelectObject(gs_bmpWithColMask);
+        memDC.SelectObject(*gs_bmpWithColMask);

         dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, TRUE);
     }
 }
 
         dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, TRUE);
     }
 }
 

+void MyCanvas::DrawWithLogicalOps(wxDC& dc)
+{
+    static const wxCoord w = 60;
+    static const wxCoord h = 60;
+
+    // reuse the text colour here
+    dc.SetPen(wxPen(m_owner->m_colourForeground, 1, wxSOLID));
+    dc.SetBrush(*wxTRANSPARENT_BRUSH);
+
+    size_t n;
+    for ( n = 0; n < WXSIZEOF(rasterOperations); n++ )
+    {
+        wxCoord x = 20 + 150*(n%4),
+                y = 20 + 100*(n/4);
+
+        dc.DrawText(rasterOperations[n].name, x, y - 20);
+        dc.SetLogicalFunction(rasterOperations[n].rop);
+        dc.DrawRectangle(x, y, w, h);
+        dc.DrawLine(x, y, x + w, y + h);
+        dc.DrawLine(x + w, y, x, y + h);
+    }
+
+    // now some filled rectangles
+    dc.SetBrush(wxBrush(m_owner->m_colourForeground, wxSOLID));
+
+    for ( n = 0; n < WXSIZEOF(rasterOperations); n++ )
+    {
+        wxCoord x = 20 + 150*(n%4),
+                y = 500 + 100*(n/4);
+
+        dc.DrawText(rasterOperations[n].name, x, y - 20);
+        dc.SetLogicalFunction(rasterOperations[n].rop);
+        dc.DrawRectangle(x, y, w, h);
+    }
+}
+
+void MyCanvas::DrawCircles(wxDC& dc)
+{
+    int x = 100,
+        y = 100,
+        r = 20;
+
+    dc.DrawText("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("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("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::DrawRegions(wxDC& dc)
+{
+    dc.DrawText("You should see a red rect partly covered by a cyan one "
+                "on the left", 10, 5);
+    dc.DrawText("and 5 smileys from which 4 are partially clipped on the right",
+                10, 5 + dc.GetCharHeight());
+    dc.DrawText("The second copy should be identical but right part of it "
+                "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 ( !firstTime )
+        region.Offset(10, 10);
+
+    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);
 void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxPaintDC dc(this);
     PrepareDC(dc);

+

     m_owner->PrepareDC(dc);
 
     dc.SetBackgroundMode( m_owner->m_backgroundMode );
     m_owner->PrepareDC(dc);
 
     dc.SetBackgroundMode( m_owner->m_backgroundMode );


@@ -673,32 +908,61 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
     if ( m_owner->m_colourBackground.Ok() )
         dc.SetTextBackground( m_owner->m_colourBackground );
 
     if ( m_owner->m_colourBackground.Ok() )
         dc.SetTextBackground( m_owner->m_colourBackground );
 

+    if ( m_owner->m_textureBackground) {
+        if ( ! m_owner->m_backgroundBrush.Ok() ) {
+            wxBrush b(wxColour(0,128,0), wxSOLID);
+            dc.SetBackground(b);
+        }
+    }
+
+    dc.Clear();
+
+    if ( m_owner->m_textureBackground) {
+        dc.SetPen(*wxMEDIUM_GREY_PEN);
+        for (int i=0; i<200; i++)
+            dc.DrawLine(0, i*10, i*10, 0);
+    }
+

     switch ( m_show )
     {
         case Show_Default:
             DrawDefault(dc);
             break;
 
     switch ( m_show )
     {
         case Show_Default:
             DrawDefault(dc);
             break;
 

+        case Show_Circles:
+            DrawCircles(dc);
+            break;
+
+        case Show_Regions:
+            DrawRegions(dc);
+            break;
+

         case Show_Text:
             DrawText(dc);
             break;
 
         case Show_Lines:
             DrawTestLines( 0, 100, 0, dc );
         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:
             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:
             DrawImages(dc);
             break;
             break;
 
         case Show_Mask:
             DrawImages(dc);
             break;

+
+        case Show_Ops:
+            DrawWithLogicalOps(dc);
+            break;

     }
 }
 
     }
 }
 


@@ -712,7 +976,7 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event)
     long x = dc.DeviceToLogicalX( pos.x );
     long y = dc.DeviceToLogicalY( pos.y );
     wxString str;
     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 );
 }
 
     m_owner->SetStatusText( str );
 }
 


@@ -734,7 +998,8 @@ END_EVENT_TABLE()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
+       : wxFrame((wxFrame *)NULL, -1, title, pos, size,
+                 wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)

 {
     // set the frame icon
     SetIcon(wxICON(mondrian));
 {
     // set the frame icon
     SetIcon(wxICON(mondrian));


@@ -743,8 +1008,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuFile->Append(File_ShowDefault, "&Default screen\tF1");
     menuFile->Append(File_ShowText, "&Text screen\tF2");
     menuFile->Append(File_ShowLines, "&Lines screen\tF3");
     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_ShowBrushes, "&Brushes screen\tF4");
+    menuFile->Append(File_ShowPolygons, "&Polygons screen\tF5");
+    menuFile->Append(File_ShowMask, "&Mask screen\tF6");
+    menuFile->Append(File_ShowOps, "&ROP screen\tF7");
+    menuFile->Append(File_ShowRegions, "Re&gions screen\tF8");
+    menuFile->Append(File_ShowCircles, "&Circles screen\tF9");

     menuFile->AppendSeparator();
     menuFile->Append(File_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();
     menuFile->AppendSeparator();
     menuFile->Append(File_About, "&About...\tCtrl-A", "Show about dialog");
     menuFile->AppendSeparator();


@@ -758,12 +1027,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuMapMode->Append( MapMode_Metric, "&METRIC map mode" );
 
     wxMenu *menuUserScale = new wxMenu;
     menuMapMode->Append( MapMode_Metric, "&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, "Stretch &horizontally\tCtrl-H" );
+    menuUserScale->Append( UserScale_ShrinkHoriz, "Shrin&k horizontally\tCtrl-G" );
+    menuUserScale->Append( UserScale_StretchVertic, "Stretch &vertically\tCtrl-V" );
+    menuUserScale->Append( UserScale_ShrinkVertic, "&Shrink vertically\tCtrl-W" );

     menuUserScale->AppendSeparator();
     menuUserScale->AppendSeparator();

-    menuUserScale->Append( UserScale_Restore, "Restore to normal\tCtrl-0" );
+    menuUserScale->Append( UserScale_Restore, "&Restore to normal\tCtrl-0" );

 
     wxMenu *menuAxis = new wxMenu;
     menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE );
 
     wxMenu *menuAxis = new wxMenu;
     menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE );


@@ -774,20 +1043,24 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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_MoveUp, "Move &up\tCtrl-U" );
     menuLogical->Append( LogicalOrigin_MoveLeft, "Move &right\tCtrl-L" );
     menuLogical->Append( LogicalOrigin_MoveRight, "Move &left\tCtrl-R" );

+    menuLogical->AppendSeparator();
+    menuLogical->Append( LogicalOrigin_Set, "Set to (&100, 100)\tShift-Ctrl-1" );
+    menuLogical->Append( LogicalOrigin_Restore, "&Restore to normal\tShift-Ctrl-0" );

 
     wxMenu *menuColour = new wxMenu;
 
     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_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 back&ground\tCtrl-T", "", TRUE);

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
     menuBar->Append(menuFile, "&File");
 
     // 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(menuMapMode, "&Mode");
+    menuBar->Append(menuUserScale, "&Scale");

     menuBar->Append(menuAxis, "&Axis");
     menuBar->Append(menuAxis, "&Axis");

-    menuBar->Append(menuLogical, "&LogicalOrigin");
+    menuBar->Append(menuLogical, "&Origin");

     menuBar->Append(menuColour, "&Colours");
 
     // ... and attach this menu bar to the frame
     menuBar->Append(menuColour, "&Colours");
 
     // ... and attach this menu bar to the frame


@@ -807,6 +1080,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_backgroundMode = wxSOLID;
     m_colourForeground = *wxRED;
     m_colourBackground = *wxBLUE;
     m_backgroundMode = wxSOLID;
     m_colourForeground = *wxRED;
     m_colourBackground = *wxBLUE;

+    m_textureBackground = FALSE;

 
     m_canvas = new MyCanvas( this );
     m_canvas->SetScrollbars( 10, 10, 100, 240 );
 
     m_canvas = new MyCanvas( this );
     m_canvas->SetScrollbars( 10, 10, 100, 240 );


@@ -823,8 +1097,10 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     wxString msg;
 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, "About Drawing", wxOK | wxICON_INFORMATION, this);


@@ -832,12 +1108,12 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnShow(wxCommandEvent& event)
 {
 
 void MyFrame::OnShow(wxCommandEvent& event)
 {

-    m_canvas->Show((ScreenToShow)(event.GetInt() - MenuShow_First));
+    m_canvas->Show((ScreenToShow)(event.GetId() - MenuShow_First));

 }
 
 void MyFrame::OnOption(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnOption(wxCommandEvent& event)
 {

-    switch (event.GetInt())
+    switch (event.GetId())

     {
         case MapMode_Text:
             m_mapMode = wxMM_TEXT;
     {
         case MapMode_Text:
             m_mapMode = wxMM_TEXT;


@@ -867,6 +1143,14 @@ void MyFrame::OnOption(wxCommandEvent& event)
         case LogicalOrigin_MoveRight:
             m_xLogicalOrigin -= 10;
             break;
         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;
 
         case UserScale_StretchHoriz:
             m_xUserScale *= 1.10;


@@ -912,6 +1196,10 @@ void MyFrame::OnOption(wxCommandEvent& event)
                                                            : wxSOLID;
             break;
 
                                                            : wxSOLID;
             break;
 

+        case Colour_TextureBackgound:
+            m_textureBackground = ! m_textureBackground;
+            break;
+

         default:
             // skip Refresh()
             return;
         default:
             // skip Refresh()
             return;


@@ -922,10 +1210,10 @@ void MyFrame::OnOption(wxCommandEvent& event)
 
 void MyFrame::PrepareDC(wxDC& dc)
 {
 
 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.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin );
     dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed );

+    dc.SetUserScale( m_xUserScale, m_yUserScale );
+    dc.SetMapMode( m_mapMode );

 }
 
 wxColour MyFrame::SelectColour()
 }
 
 wxColour MyFrame::SelectColour()