fix for pageup 'blind spot'

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index ddfdeaa0096179d56154f2025181e3e134a0feec..c0bd806ac895b496cf9b54c141a41e14fc922076 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -60,7 +60,8 @@ enum ScreenToShow
     Show_Lines,
     Show_Polygons,
     Show_Mask,
     Show_Lines,
     Show_Polygons,
     Show_Mask,

-    Show_Ops
+    Show_Ops,
+    Show_Regions

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


@@ -72,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;
 
 // ----------------------------------------------------------------------------


@@ -148,12 +150,15 @@ protected:
     void DrawText(wxDC& dc);
     void DrawImages(wxDC& dc);
     void DrawWithLogicalOps(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()
 };


@@ -176,7 +181,8 @@ enum
     File_ShowPolygons,
     File_ShowMask,
     File_ShowOps,
     File_ShowPolygons,
     File_ShowMask,
     File_ShowOps,

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

 
     MenuOption_First,
 
 
     MenuOption_First,
 


@@ -238,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 )


@@ -310,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];


@@ -360,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;


@@ -514,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;
 }
 


@@ -572,35 +593,29 @@ 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);
 
     dc.DrawCheckMark(5, 80, 15, 15);
     dc.DrawCheckMark(25, 80, 30, 30);
     dc.DrawCheckMark(60, 80, 60, 60);
 

-    // this is the test for "blitting bitmap into DC damages selected brush"
-    // bug
-    wxIcon icon = wxTheApp->GetStdIcon(wxICON_INFORMATION);
-    wxCoord rectSize = icon.GetWidth() + 10;
+    // this is the test for "blitting bitmap into DC damages selected brush" bug
+    wxCoord rectSize = m_std_icon.GetWidth() + 10;

     wxCoord x = 100;
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush( *wxGREEN_BRUSH );
     dc.DrawRectangle(x, 10, rectSize, rectSize);
     wxCoord x = 100;
     dc.SetPen(*wxTRANSPARENT_PEN);
     dc.SetBrush( *wxGREEN_BRUSH );
     dc.DrawRectangle(x, 10, rectSize, rectSize);

-    dc.DrawBitmap(icon, x + 5, 15, TRUE);
+    dc.DrawBitmap(m_std_icon, x + 5, 15, TRUE);

     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);
     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);

-    dc.DrawIcon(wxTheApp->GetStdIcon(wxICON_INFORMATION), x + 5, 15);
+    dc.DrawIcon(m_std_icon, x + 5, 15);

     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);
 
     // test for "transparent" bitmap drawing (it intersects with the last
     // rectangle above)
     //dc.SetBrush( *wxTRANSPARENT_BRUSH );
     x += rectSize + 10;
     dc.DrawRectangle(x, 10, rectSize, rectSize);
 
     // test for "transparent" bitmap drawing (it intersects with the last
     // rectangle above)
     //dc.SetBrush( *wxTRANSPARENT_BRUSH );

-    #include "../image/smile.xpm"
-    wxBitmap bmp(smile_xpm);

 
 

-    if (bmp.Ok())
-        dc.DrawBitmap(bmp, x + rectSize - 20, rectSize - 10, TRUE);
+    if (m_smile_bmp.Ok())
+        dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, TRUE);

 
     dc.SetBrush( *wxBLACK_BRUSH );
     dc.DrawRectangle( 0, 160, 1000, 300 );
 
     dc.SetBrush( *wxBLACK_BRUSH );
     dc.DrawRectangle( 0, 160, 1000, 300 );


@@ -888,6 +903,37 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
     }
 }
 
     }
 }
 

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


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

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

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


@@ -936,8 +986,10 @@ 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:
             break;
 
         case Show_Mask:


@@ -994,6 +1046,7 @@ 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->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();