Remaining Makefile.ins,

  Changed cp flags for "apply",
  Added linestyle test
  char -> wxChar in wxStringTokenizer

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 012646186d3ee63f7d71f54e43cbf44bf77d0180..ec4d74558eb4c2c97804f291a8d5d59d5a97a9c4 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -392,7 +392,45 @@ void MyFrame::OnPaint(wxPaintEvent &WXUNUSED(event) )
 #endif // __WXGTK__
 
     dc.DrawRectangle( 10, 10, 90, 90 );
-    dc.DrawRoundedRectangle( 10, 110, 90, 90, 5 );
+    dc.DrawRoundedRectangle( 110, 10, 90, 90, 5 );
+    
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 10, 110, 100, 110 );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawLine( 100, 110, 100, 200 );
+    dc.SetPen( *wxWHITE_PEN );
+    dc.DrawLine( 100, 200, 10, 200 );
+    dc.SetPen( *wxBLACK_PEN );
+    dc.DrawLine( 10, 200, 10, 110 );
+    
+    wxPen white_butt( "white", 1, wxSOLID );
+    white_butt.SetCap( wxCAP_BUTT );
+    wxPen black_butt( "black", 1, wxSOLID );
+    black_butt.SetCap( wxCAP_BUTT );
+    
+    dc.SetPen( white_butt );
+    dc.DrawLine( 110, 110, 200, 110 );
+    dc.SetPen( black_butt );
+    dc.DrawLine( 200, 110, 200, 200 );
+    dc.SetPen( white_butt );
+    dc.DrawLine( 200, 200, 110, 200 );
+    dc.SetPen( black_butt );
+    dc.DrawLine( 110, 200, 110, 110 );
+    
+    wxPen white_miter( "white", 1, wxSOLID );
+    white_miter.SetJoin( wxJOIN_MITER );
+    wxPen black_miter( "black", 1, wxSOLID );
+    black_miter.SetJoin( wxJOIN_MITER );
+    
+    dc.SetPen( white_miter );
+    dc.DrawLine( 210, 110, 300, 110 );
+    dc.SetPen( black_miter );
+    dc.DrawLine( 300, 110, 300, 200 );
+    dc.SetPen( white_miter );
+    dc.DrawLine( 300, 200, 210, 200 );
+    dc.SetPen( black_miter );
+    dc.DrawLine( 210, 200, 210, 110 );
+    
 
     dc.DrawText( "This is text\n(on multiple lines)", 110, 10 );
 

diff --git a/src/common/tokenzr.cpp b/src/common/tokenzr.cpp
index b22a79ba2650e3d8625da91ffca41f5277cd86be..837243cac6c575a1534e733a9147adc77295761f 100644 (file)
--- a/src/common/tokenzr.cpp
+++ b/src/common/tokenzr.cpp
@@ -39,7 +39,7 @@ off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims)
 {
     for ( size_t i = 0; i < str.Length(); i++ )
     {
-        char c = str[i];
+        wxChar c = str[i];
 
         for ( size_t j = 0; j < delims.Length() ; j++ )
         {