wxFileSelector should have file name only, not path, passed to 3rd arg

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 1c67694c3203feead3c95e8fa9cb884eca5ec5bb..ac67006879ec1ad4879c17bb24039e2425185d95 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -61,19 +61,21 @@ enum ScreenToShow
     Show_Polygons,
     Show_Mask,
     Show_Ops,
     Show_Polygons,
     Show_Mask,
     Show_Ops,

-    Show_Regions
+    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


@@ -91,7 +93,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();
 };
 


@@ -150,6 +156,7 @@ protected:
     void DrawImages(wxDC& dc);
     void DrawWithLogicalOps(wxDC& dc);
     void DrawRegions(wxDC& dc);
     void DrawImages(wxDC& dc);
     void DrawWithLogicalOps(wxDC& dc);
     void DrawRegions(wxDC& dc);

+    void DrawCircles(wxDC& dc);

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


@@ -181,7 +188,8 @@ enum
     File_ShowMask,
     File_ShowOps,
     File_ShowRegions,
     File_ShowMask,
     File_ShowOps,
     File_ShowRegions,

-    MenuShow_Last = File_ShowRegions,
+    File_ShowCircles,
+    MenuShow_Last = File_ShowCircles,

 
     MenuOption_First,
 
 
     MenuOption_First,
 


@@ -236,6 +244,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("..");


@@ -243,38 +259,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);
-
-//    This is so wrong, it hurts.
-//    gs_bmpMask.SetDepth(1);
-//    wxMask *mask = new wxMask(gs_bmpMask);
+    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;
 }


@@ -297,6 +313,8 @@ bool MyApp::OnInit()
                    "there.");
 
         // stop here
                    "there.");
 
         // stop here

+        DeleteBitmaps();
+

         return FALSE;
     }
 
         return FALSE;
     }
 


@@ -304,6 +322,17 @@ 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;
+}
+

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


@@ -325,21 +354,23 @@ MyCanvas::MyCanvas( MyFrame *parent ) : wxScrolledWindow( parent )
     m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
 }
 
     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* brush36 = new wxBrush(gs_bmp36);
+//    wxBrush* brush4 = new wxBrush(*gs_bmp4);
+    wxBrush* brush4 = new wxBrush(*wxBLACK,wxFDIAGONAL_HATCH);
+    wxBrush* brush4_mono = new wxBrush(*gs_bmp4_mono);
+    wxBrush* brush36 = new wxBrush(*gs_bmp36);

 
     wxPoint todraw[5];
     todraw[0].x=(long)x+100;
 
     wxPoint todraw[5];
     todraw[0].x=(long)x+100;


@@ -369,20 +400,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;


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

+    delete brush4_mono;

     delete brush36;
 }
 
     delete brush36;
 }
 


@@ -530,8 +568,10 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
 {
     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.SetBrush( *wxRED_BRUSH );
 {
     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.SetBrush( *wxRED_BRUSH );

+    dc.DrawText(wxString::Format("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.DrawText("Solid/dot/short dash/long dash/dot dash", x + 150, y + 10);

     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.DrawLine( x+20, y+20, 100, y+20 );
     dc.SetPen( wxPen( "black", width, wxDOT) );
     dc.SetPen( wxPen( "black", width, wxSOLID) );
     dc.DrawLine( x+20, y+20, 100, y+20 );
     dc.SetPen( wxPen( "black", width, wxDOT) );


@@ -543,6 +583,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     dc.SetPen( wxPen( "black", width, wxDOT_DASH) );
     dc.DrawLine( x+20, y+60, 100, y+60 );
 
     dc.SetPen( wxPen( "black", width, wxDOT_DASH) );
     dc.DrawLine( x+20, y+60, 100, y+60 );
 

+    dc.DrawText("Misc hatches", x + 150, y + 70);

     dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) );
     dc.DrawLine( x+20, y+70, 100, y+70 );
     dc.SetPen( wxPen( "black", width, wxCROSSDIAG_HATCH) );
     dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) );
     dc.DrawLine( x+20, y+70, 100, y+70 );
     dc.SetPen( wxPen( "black", width, wxCROSSDIAG_HATCH) );


@@ -556,6 +597,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
     dc.SetPen( wxPen( "black", width, wxVERTICAL_HATCH) );
     dc.DrawLine( x+20, y+120, 100, y+120 );
 
     dc.SetPen( wxPen( "black", width, wxVERTICAL_HATCH) );
     dc.DrawLine( x+20, y+120, 100, y+120 );
 

+    dc.DrawText("User dash", x + 150, y + 140);

     wxPen ud( "black", width, wxUSER_DASH );
     wxDash dash1[1];
     dash1[0] = 0;
     wxPen ud( "black", width, wxUSER_DASH );
     wxDash dash1[1];
     dash1[0] = 0;


@@ -567,7 +609,7 @@ 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 );
 }


@@ -581,14 +623,11 @@ 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), 40, 40 );
-

     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
     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 m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);

     wxCoord rectSize = m_std_icon.GetWidth() + 10;
     wxCoord x = 100;
     dc.SetPen(*wxTRANSPARENT_PEN);
     wxCoord rectSize = m_std_icon.GetWidth() + 10;
     wxCoord x = 100;
     dc.SetPen(*wxTRANSPARENT_PEN);


@@ -784,7 +823,7 @@ void MyCanvas::DrawText(wxDC& dc)
     dc.SetFont( *wxNORMAL_FONT );
 
     wxString text;
     dc.SetFont( *wxNORMAL_FONT );
 
     wxString text;

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

 
     for ( int n = -180; n < 180; n += 30 )
     {
 
     for ( int n = -180; n < 180; n += 30 )
     {


@@ -807,6 +846,24 @@ void MyCanvas::DrawText(wxDC& dc)
     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 );

 }
 
 static const struct
 }
 
 static const struct


@@ -835,16 +892,16 @@ static const struct
 void MyCanvas::DrawImages(wxDC& dc)
 {
     dc.DrawText("original image", 0, 0);
 void MyCanvas::DrawImages(wxDC& dc)
 {
     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++ )


@@ -853,7 +910,7 @@ 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);
     }
 }


@@ -894,29 +951,72 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
     }
 }
 
     }
 }
 

+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.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle( 10,10,310,310 );
     
 void MyCanvas::DrawRegions(wxDC& dc)
 {
     dc.SetBrush( *wxWHITE_BRUSH );
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.DrawRectangle( 10,10,310,310 );
     

-    wxRegion region( 20,20,100,270 );
-    dc.SetClippingRegion( region );
+    dc.SetClippingRegion( 20,20,100,270 );

     
     dc.SetBrush( *wxRED_BRUSH );
     dc.DrawRectangle( 10,10,310,310 );
     
     dc.SetBrush( *wxRED_BRUSH );
     dc.DrawRectangle( 10,10,310,310 );

+
+    dc.SetClippingRegion( 20,20,100,100 );

     
     

-    region = wxRegion( 120,30,100,270 );
-    dc.SetClippingRegion( region );
+    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 );
     
     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);
     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 );


@@ -934,7 +1034,7 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
         }
     }
 
         }
     }
 

-//    dc.Clear();
+    dc.Clear();

 
     if ( m_owner->m_textureBackground) {
         dc.SetPen(*wxMEDIUM_GREY_PEN);
 
     if ( m_owner->m_textureBackground) {
         dc.SetPen(*wxMEDIUM_GREY_PEN);


@@ -948,6 +1048,10 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
             DrawDefault(dc);
             break;
 
             DrawDefault(dc);
             break;
 

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

         case Show_Regions:
             DrawRegions(dc);
             break;
         case Show_Regions:
             DrawRegions(dc);
             break;


@@ -958,15 +1062,17 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
 
         case Show_Lines:
             DrawTestLines( 0, 100, 0, dc );
 
         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_Polygons:
             DrawTestPoly( 0,  100, dc, 0 );
             break;
 
         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:
             break;
 
         case Show_Mask:


@@ -976,6 +1082,13 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
         case Show_Ops:
             DrawWithLogicalOps(dc);
             break;
         case Show_Ops:
             DrawWithLogicalOps(dc);
             break;

+          
+        default:
+        {
+          dc.SetPen( *wxBLACK_PEN );
+          dc.DrawLine( 0,0,100,100 );
+        }
+    

     }
 }
 
     }
 }
 


@@ -1023,7 +1136,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     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_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->Append(File_ShowRegions, "Re&gions screen\tF7");
+    menuFile->Append(File_ShowCircles, "&Circles screen\tF8");

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


@@ -1115,12 +1229,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;