Applied patch [ 767505 ] BCB6 link error

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 573ef9c94af7b5f6cb0b96f2201a4225bbff08a0..828799729396b894812556f9bf0c4beb3a68b865 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -464,18 +464,27 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc )
 
     dc.DrawText(_T("User dash"), x + 150, y + 140);
     wxPen ud( wxT("black"), width, wxUSER_DASH );
 
     dc.DrawText(_T("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[6];
+    dash1[0] = 8;  // Long dash  <---------+
+    dash1[1] = 2;  // Short gap            |
+    dash1[2] = 3;  // Short dash           |
+    dash1[3] = 2;  // Short gap            |
+    dash1[4] = 3;  // Short dash           |
+    dash1[5] = 2;  // Short gap and repeat +
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );

     dc.DrawLine( x+20, y+140, 100, y+140 );
     dc.DrawLine( x+20, y+140, 100, y+140 );

-    dash1[0] = 1;
-    ud.SetDashes( 1, dash1 );
+    dash1[0] = 5;  // Make first dash shorter
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );

     dc.DrawLine( x+20, y+150, 100, y+150 );
     dc.DrawLine( x+20, y+150, 100, y+150 );

-    dash1[0] = 2;
-    ud.SetDashes( 1, dash1 );
+    dash1[2] = 5;  // Make second dash longer
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );

     dc.DrawLine( x+20, y+160, 100, y+160 );
     dc.DrawLine( x+20, y+160, 100, y+160 );

-    dash1[0] = 0x7F;
-    ud.SetDashes( 1, dash1 );
+    dash1[4] = 5;  // Make third dash longer
+    ud.SetDashes( 6, dash1 );
+    dc.SetPen( ud );

     dc.DrawLine( x+20, y+170, 100, y+170 );
 }
 
     dc.DrawLine( x+20, y+170, 100, y+170 );
 }
 


@@ -1253,3 +1262,4 @@ wxColour MyFrame::SelectColour()
 
     return col;
 }
 
     return col;
 }

+