Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remaining Makefile.ins,

Browse Source 
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
This commit is contained in:
Robert Roebling
1999-06-19 08:29:21 +00:00
parent d9a451ce33
commit c17bcb8448
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
samples/drawing/drawing.cpp
View File

@@ -392,7 +392,45 @@ void MyFrame::OnPaint(wxPaintEvent &WXUNUSED(event) )
#endif // __WXGTK__ #endif // __WXGTK__
dc.DrawRectangle( 10, 10, 90, 90 ); 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 ); dc.DrawText( "This is text\n(on multiple lines)", 110, 10 );

2
src/common/tokenzr.cpp
View File

@@ -39,7 +39,7 @@ off_t wxStringTokenizer::FindDelims(const wxString& str, const wxString& delims)
{ {
for ( size_t i = 0; i < str.Length(); i++ ) 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++ ) for ( size_t j = 0; j < delims.Length() ; j++ )
{ {