test data file for console sample

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 033c391e3373592d252afbf37a62c59051b95e95..c0bd806ac895b496cf9b54c141a41e14fc922076 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -36,6 +36,7 @@
 #endif
 
 #include "wx/colordlg.h"
 #endif
 
 #include "wx/colordlg.h"

+#include "wx/image.h"

 
 // ----------------------------------------------------------------------------
 // ressources
 
 // ----------------------------------------------------------------------------
 // ressources


@@ -58,7 +59,9 @@ enum ScreenToShow
     Show_Text,
     Show_Lines,
     Show_Polygons,
     Show_Text,
     Show_Lines,
     Show_Polygons,

-    Show_Mask
+    Show_Mask,
+    Show_Ops,
+    Show_Regions

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


@@ -70,6 +73,7 @@ static wxBitmap gs_bmpNoMask,
                 gs_bmpMask,
                 gs_bmpWithMask,
                 gs_bmp4,
                 gs_bmpMask,
                 gs_bmpWithMask,
                 gs_bmp4,

+                gs_bmp4_mono,

                 gs_bmp36;
 
 // ----------------------------------------------------------------------------
                 gs_bmp36;
 
 // ----------------------------------------------------------------------------


@@ -111,6 +115,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;


@@ -144,12 +149,16 @@ protected:
     void DrawTestLines( int x, int y, int width, wxDC &dc );
     void DrawText(wxDC& dc);
     void DrawImages(wxDC& dc);
     void DrawTestLines( int x, int y, int width, wxDC &dc );
     void DrawText(wxDC& dc);
     void DrawImages(wxDC& dc);

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

     void DrawDefault(wxDC& dc);
 
 private:
     MyFrame *m_owner;
 
     ScreenToShow m_show;
     void DrawDefault(wxDC& dc);
 
 private:
     MyFrame *m_owner;
 
     ScreenToShow m_show;

+    wxBitmap     m_smile_bmp;
+    wxIcon       m_std_icon;

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };


@@ -171,7 +180,9 @@ enum
     File_ShowLines,
     File_ShowPolygons,
     File_ShowMask,
     File_ShowLines,
     File_ShowPolygons,
     File_ShowMask,

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

 
     MenuOption_First,
 
 
     MenuOption_First,
 


@@ -199,8 +210,9 @@ enum
     Colour_TextBackground,
     Colour_Background,
     Colour_BackgroundMode,
     Colour_TextBackground,
     Colour_Background,
     Colour_BackgroundMode,

+    Colour_TextureBackgound,

 
 

-    MenuOption_Last = Colour_BackgroundMode
+    MenuOption_Last = Colour_TextureBackgound

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


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

+    /* 4 colour bitmap */

     gs_bmp4.LoadFile(path, wxBITMAP_TYPE_BMP);
     gs_bmp4.LoadFile(path, wxBITMAP_TYPE_BMP);

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


@@ -254,7 +269,7 @@ bool MyApp::LoadImages()
     if ( !path )
         return FALSE;
     gs_bmpMask.LoadFile(path, wxBITMAP_TYPE_BMP);
     if ( !path )
         return FALSE;
     gs_bmpMask.LoadFile(path, wxBITMAP_TYPE_BMP);

-    
+

 //    This is so wrong, it hurts.
 //    gs_bmpMask.SetDepth(1);
 //    wxMask *mask = new wxMask(gs_bmpMask);
 //    This is so wrong, it hurts.
 //    gs_bmpMask.SetDepth(1);
 //    wxMask *mask = new wxMask(gs_bmpMask);


@@ -304,26 +319,31 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
     EVT_MOTION (MyCanvas::OnMouseMove)
 END_EVENT_TABLE()
 
     EVT_MOTION (MyCanvas::OnMouseMove)
 END_EVENT_TABLE()
 

+#include "../image/smile.xpm"
+

 MyCanvas::MyCanvas( MyFrame *parent ) : wxScrolledWindow( parent )
 {
     m_owner = parent;
     m_show = Show_Default;
 MyCanvas::MyCanvas( MyFrame *parent ) : wxScrolledWindow( parent )
 {
     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
+// Draw a polygon and an overlapping rectangle
+// If transparent is 1, the fill pattern is made transparent.
+// If transparent is 2, the fill pattern is made transparent but inversed
+// If 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
+// I abused 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::DrawTestPoly( int x, int y,wxDC &dc,int transparent )
 {

-    wxBrush* brush4  = new wxBrush(gs_bmp4);
+    wxBrush* brush4 = new wxBrush(gs_bmp4);
+    wxBrush* brush4_mono = new wxBrush(gs_bmp4_mono);

     wxBrush* brush36 = new wxBrush(gs_bmp36);
 
     wxPoint todraw[5];
     wxBrush* brush36 = new wxBrush(gs_bmp36);
 
     wxPoint todraw[5];


@@ -354,20 +374,26 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent )
     {
         case 0:
             {
     {
         case 0:
             {

+                dc.SetLogicalFunction(wxCOPY);
+

                 dc.SetPen( wxPen( "black", 4, wxSOLID) );
                 dc.SetBrush( *brush4 );
                 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);
 
                 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.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.DrawRectangle( x+10, y+10, 200, 200 );

+                
+                dc.SetPen( wxPen( "green", 4, wxSOLID) );
+                dc.SetBrush( *brush4_mono );
+                dc.SetTextForeground(*wxCYAN);
+                dc.SetTextBackground(m_owner->m_colourBackground);
+                dc.DrawRectangle( x+50, y+50, 200, 200 );
+                
+                dc.DrawCircle( x+400, y+50, 130 );
+                

                 dc.SetBrush(wxNullBrush);
                 dc.SetPen(wxNullPen);
                 break;
                 dc.SetBrush(wxNullBrush);
                 dc.SetPen(wxNullPen);
                 break;


@@ -508,6 +534,7 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent )
     }
 
     delete brush4;
     }
 
     delete brush4;

+    delete brush4_mono;

     delete brush36;
 }
 
     delete brush36;
 }
 


@@ -555,7 +582,6 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     dash1[0] = 0xFF;
     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+170, 100, y+170 );
     dash1[0] = 0xFF;
     ud.SetDashes( 1, dash1 );
     dc.DrawLine( x+20, y+170, 100, y+170 );

-

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


@@ -567,52 +593,194 @@ void MyCanvas::DrawDefault(wxDC& dc)
     dc.FloodFill(0, 0, wxColour(255, 0, 0));
 #endif //
 
     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);

 
 

-    dc.SetBrush( *wxBLACK_BRUSH );
+    // 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.DrawRectangle( 0, 100, 1000, 300 );
+    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);

 
 

-    // test the rectangle outline drawing - there should be one pixel between 
+    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 );
     // the rect and the lines
     dc.SetPen(*wxWHITE_PEN);
     dc.SetBrush( *wxTRANSPARENT_BRUSH );

-    dc.DrawRectangle(100, 170, 49, 29);

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

+    dc.DrawRectangle(200, 170, 49, 29);

     dc.SetPen(*wxWHITE_PEN);
     dc.SetPen(*wxWHITE_PEN);

-    dc.DrawLine(200, 160, 200, 210); 
-    dc.DrawLine(100, 200, 210, 200); 
-    
-    // test the rectangle filled drawing - there should be one pixel between 
+    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.SetPen(*wxWHITE_PEN);
     // 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.SetPen(*wxWHITE_PEN);

-    dc.DrawLine(400, 160, 400, 210); 
-    dc.DrawLine(300, 200, 410, 200); 
-    
-    // test the rectangle outline drawing - there should be one pixel between 
+    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 );
+    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 );
     // the rect and the lines
     dc.SetPen(*wxWHITE_PEN);
     dc.SetBrush( *wxTRANSPARENT_BRUSH );

-    dc.DrawRoundedRectangle(100, 270, 49, 29, 6);

     dc.DrawRoundedRectangle(150, 270, 49, 29, 6);
     dc.DrawRoundedRectangle(150, 270, 49, 29, 6);

+    dc.DrawRoundedRectangle(200, 270, 49, 29, 6);

     dc.SetPen(*wxWHITE_PEN);
     dc.SetPen(*wxWHITE_PEN);

-    dc.DrawLine(200, 260, 200, 310); 
-    dc.DrawLine(100, 300, 210, 300); 
-    
-    // test the rectangle filled drawing - there should be one pixel between 
+    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);
     // 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, 260, 400, 310); 
-    dc.DrawLine(300, 300, 410, 300); 
+    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)


@@ -650,31 +818,31 @@ void MyCanvas::DrawText(wxDC& dc)
     dc.DrawRectangle( 100, 40, 4, height );
 }
 
     dc.DrawRectangle( 100, 40, 4, height );
 }
 

-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[] =
+{
+    { "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           },
+};

 
 

+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.DrawText("original image", 0, 0);
     dc.DrawBitmap(gs_bmpNoMask, 0, 20, 0);
     dc.DrawText("with colour mask", 0, 100);


@@ -699,6 +867,73 @@ void MyCanvas::DrawImages(wxDC& dc)
     }
 }
 
     }
 }
 

+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::DrawRegions(wxDC& dc)
+{
+    dc.SetBrush( *wxWHITE_BRUSH );
+    dc.SetPen( *wxTRANSPARENT_PEN );
+    dc.DrawRectangle( 10,10,310,310 );
+    
+    dc.SetClippingRegion( 20,20,100,270 );
+    
+    dc.SetBrush( *wxRED_BRUSH );
+    dc.DrawRectangle( 10,10,310,310 );
+
+    dc.SetClippingRegion( 20,20,100,100 );
+    
+    dc.SetBrush( *wxCYAN_BRUSH );
+    dc.DrawRectangle( 10,10,310,310 );
+
+    dc.DestroyClippingRegion();
+    dc.SetClippingRegion( 120,30,100,270 );
+    
+    dc.SetBrush( *wxGREY_BRUSH );
+    dc.DrawRectangle( 10,10,310,310 );
+    
+    if (m_smile_bmp.Ok())
+    {
+        dc.DrawBitmap( m_smile_bmp, 140, 20, TRUE );
+        dc.DrawBitmap( m_smile_bmp, 140, 290, TRUE );
+        dc.DrawBitmap( m_smile_bmp, 110, 80, TRUE );
+        dc.DrawBitmap( m_smile_bmp, 210, 80, TRUE );
+    }
+}
+

 void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxPaintDC dc(this);
 void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 {
     wxPaintDC dc(this);


@@ -713,12 +948,31 @@ 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_Regions:
+            DrawRegions(dc);
+            break;
+

         case Show_Text:
             DrawText(dc);
             break;
         case Show_Text:
             DrawText(dc);
             break;


@@ -732,13 +986,19 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 
         case Show_Polygons:
             DrawTestPoly( 0,  100, dc, 0 );
 
         case Show_Polygons:
             DrawTestPoly( 0,  100, dc, 0 );

+/*

             DrawTestPoly( 33, 500, dc, 1 );
             DrawTestPoly( 43, 1000, dc, 2 );
             DrawTestPoly( 33, 500, dc, 1 );
             DrawTestPoly( 43, 1000, dc, 2 );

+*/

             break;
 
         case Show_Mask:
             DrawImages(dc);
             break;
             break;
 
         case Show_Mask:
             DrawImages(dc);
             break;

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

     }
 }
 
     }
 }
 


@@ -785,6 +1045,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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_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_ShowRegions, "Re&gions screen\tF6");

     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();


@@ -820,6 +1082,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     menuColour->Append( Colour_TextBackground, "Text background..." );
     menuColour->Append( Colour_Background, "Background colour..." );
     menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE );
     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);

 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;


@@ -847,6 +1110,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 );


@@ -863,8 +1127,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 tests 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);


@@ -952,6 +1218,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;