Added test for region clipping.

  Corrected makefile.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/dragimag/Makefile.in b/samples/dragimag/Makefile.in
index 3013c9a4bbad7ba0e0ed23c2082da90746543280..4396949711c4b3fcccb5285bab530faefce2e89a 100644 (file)
--- a/samples/dragimag/Makefile.in
+++ b/samples/dragimag/Makefile.in
@@ -15,7 +15,7 @@ program_dir = samples/dragimag
 
 PROGRAM=test
 
 
 PROGRAM=test
 

-DATAFILES = backgrnd.png shape1.png shape2.png shape3.png
+DATAFILES = backgrnd.png shape01.png shape02.png shape03.png

 
 OBJECTS=$(PROGRAM).o
 
 
 OBJECTS=$(PROGRAM).o
 

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 692fcebb866ba16c73fa033c0d425822c23b1998..1c67694c3203feead3c95e8fa9cb884eca5ec5bb 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

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


@@ -148,6 +149,7 @@ 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:
     void DrawDefault(wxDC& dc);
 
 private:


@@ -178,7 +180,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,
 


@@ -891,6 +894,25 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
     }
 }
 
     }
 }
 

+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.SetBrush( *wxRED_BRUSH );
+    dc.DrawRectangle( 10,10,310,310 );
+    
+    region = wxRegion( 120,30,100,270 );
+    dc.SetClippingRegion( region );
+    
+    dc.SetBrush( *wxGREY_BRUSH );
+    dc.DrawRectangle( 10,10,310,310 );
+}
+

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


@@ -912,7 +934,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);


@@ -926,6 +948,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;


@@ -997,6 +1023,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();