X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83661a1347733ddad2a7c264f920658e3095ff13..c16d276354b116475bf85a0388b4b0f545da0f82:/samples/drawing/drawing.cpp diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 0e8f8ee757..bd1c29c4e4 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -310,9 +310,9 @@ bool MyApp::OnInit() if ( !LoadImages() ) { - wxLogError("Can't load one of the bitmap files needed for this sample " - "from the current or parent directory, please copy them " - "there."); + wxLogError(wxT("Can't load one of the bitmap files needed ") + wxT("for this sample from the current or parent ") + wxT("directory, please copy them there.")); // stop here DeleteBitmaps(); @@ -406,17 +406,17 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) { dc.SetLogicalFunction(wxCOPY); - dc.SetPen( wxPen( "black", 4, wxSOLID) ); + dc.SetPen( wxPen( wxT("black"), 4, wxSOLID) ); dc.SetBrush( *brush4 ); dc.DrawPolygon(5,todraw,0,0,wxWINDING_RULE); - dc.SetPen( wxPen( "red", 4, wxSOLID) ); + dc.SetPen( wxPen( wxT("red"), 4, wxSOLID) ); dc.SetBrush( *brush36 ); dc.SetTextForeground(*wxCYAN); dc.SetTextBackground(m_owner->m_colourBackground); dc.DrawRectangle( x+10, y+10, 200, 200 ); - dc.SetPen( wxPen( "green", 4, wxSOLID) ); + dc.SetPen( wxPen( wxT("green"), 4, wxSOLID) ); dc.SetBrush( *brush4_mono ); dc.SetTextForeground(*wxCYAN); dc.SetTextBackground(m_owner->m_colourBackground); @@ -441,7 +441,7 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) memDC->Clear(); memDC->SetBackground(wxNullBrush); - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) ); memDC->SetBrush( wxNullBrush); memDC->SetBrush( *brush4 ); memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) @@ -463,12 +463,12 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "red", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("red"), 4, wxSOLID) ); memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); memDC->SetLogicalFunction(wxCOPY); - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) ); memDC->SetBrush( wxNullBrush); memDC->SetBrush( *brush36 ); memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) @@ -487,7 +487,7 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) memDC->SetLogicalFunction(wxOR); //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "yellow", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("yellow"), 4, wxSOLID) ); memDC->DrawRectangle( 10, 10, 200, 200 ); memDC->SetBrush(wxNullBrush); @@ -510,7 +510,7 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) memDC->Clear(); memDC->SetBackground(wxNullBrush); - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) ); memDC->SetBrush( *brush4 ); memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white) @@ -530,12 +530,12 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "red", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("red"), 4, wxSOLID) ); memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); memDC->SetLogicalFunction(wxCOPY); - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("black"), 4, wxSOLID) ); memDC->SetBrush( *brush36 ); memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white) @@ -552,7 +552,7 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) memDC->SetLogicalFunction(wxOR); //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "yellow", 4, wxSOLID) ); + memDC->SetPen( wxPen( wxT("yellow"), 4, wxSOLID) ); memDC->DrawRectangle( 10, 10, 200, 200 ); memDC->SetBrush(wxNullBrush); @@ -570,39 +570,39 @@ void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) { - dc.SetPen( wxPen( "black", width, wxSOLID) ); + dc.SetPen( wxPen( wxT("black"), width, wxSOLID) ); dc.SetBrush( *wxRED_BRUSH ); - dc.DrawText(wxString::Format("Testing lines of width %d", width), x + 10, y - 10); + dc.DrawText(wxString::Format(wxT("Testing lines of width %d"), width), x + 10, y - 10); dc.DrawRectangle( x+10, y+10, 100, 190 ); dc.DrawText("Solid/dot/short dash/long dash/dot dash", x + 150, y + 10); - dc.SetPen( wxPen( "black", width, wxSOLID) ); + dc.SetPen( wxPen( wxT("black"), width, wxSOLID) ); dc.DrawLine( x+20, y+20, 100, y+20 ); - dc.SetPen( wxPen( "black", width, wxDOT) ); + dc.SetPen( wxPen( wxT("black"), width, wxDOT) ); dc.DrawLine( x+20, y+30, 100, y+30 ); - dc.SetPen( wxPen( "black", width, wxSHORT_DASH) ); + dc.SetPen( wxPen( wxT("black"), width, wxSHORT_DASH) ); dc.DrawLine( x+20, y+40, 100, y+40 ); - dc.SetPen( wxPen( "black", width, wxLONG_DASH) ); + dc.SetPen( wxPen( wxT("black"), width, wxLONG_DASH) ); dc.DrawLine( x+20, y+50, 100, y+50 ); - dc.SetPen( wxPen( "black", width, wxDOT_DASH) ); + dc.SetPen( wxPen( wxT("black"), width, wxDOT_DASH) ); dc.DrawLine( x+20, y+60, 100, y+60 ); dc.DrawText("Misc hatches", x + 150, y + 70); - dc.SetPen( wxPen( "black", width, wxBDIAGONAL_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxBDIAGONAL_HATCH) ); dc.DrawLine( x+20, y+70, 100, y+70 ); - dc.SetPen( wxPen( "black", width, wxCROSSDIAG_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxCROSSDIAG_HATCH) ); dc.DrawLine( x+20, y+80, 100, y+80 ); - dc.SetPen( wxPen( "black", width, wxFDIAGONAL_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxFDIAGONAL_HATCH) ); dc.DrawLine( x+20, y+90, 100, y+90 ); - dc.SetPen( wxPen( "black", width, wxCROSS_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxCROSS_HATCH) ); dc.DrawLine( x+20, y+100, 100, y+100 ); - dc.SetPen( wxPen( "black", width, wxHORIZONTAL_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxHORIZONTAL_HATCH) ); dc.DrawLine( x+20, y+110, 100, y+110 ); - dc.SetPen( wxPen( "black", width, wxVERTICAL_HATCH) ); + dc.SetPen( wxPen( wxT("black"), width, wxVERTICAL_HATCH) ); dc.DrawLine( x+20, y+120, 100, y+120 ); dc.DrawText("User dash", x + 150, y + 140); - wxPen ud( "black", width, wxUSER_DASH ); + wxPen ud( wxT("black"), width, wxUSER_DASH ); wxDash dash1[1]; dash1[0] = 0; ud.SetDashes( 1, dash1 ); @@ -622,7 +622,7 @@ void MyCanvas::DrawDefault(wxDC& dc) { // mark the origin dc.DrawCircle(0, 0, 10); -#if !(defined __WXGTK__) && !(defined __WXMOTIF__) +#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__) // not implemented in wxGTK or wxMOTIF :-( dc.FloodFill(0, 0, wxColour(255, 0, 0)); #endif // @@ -824,14 +824,16 @@ void MyCanvas::DrawText(wxDC& dc) dc.DrawText( "This is text", 110, 10 ); dc.DrawRotatedText( "That is text", 20, 10, -45 ); - dc.SetFont( *wxNORMAL_FONT ); + // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated + // under Win9x (it is not TrueType) + dc.SetFont( *wxSWISS_FONT ); wxString text; dc.SetBackgroundMode(wxTRANSPARENT); for ( int n = -180; n < 180; n += 30 ) { - text.Printf(" %d rotated text", n); + text.Printf(wxT(" %d rotated text"), n); dc.DrawRotatedText(text , 400, 400, n); } @@ -843,10 +845,10 @@ void MyCanvas::DrawText(wxDC& dc) long height; long descent; dc.GetTextExtent( "This is Swiss 18pt text.", &length, &height, &descent ); - text.Printf( "Dimensions are length %ld, height %ld, descent %ld", length, height, descent ); + text.Printf( wxT("Dimensions are length %ld, height %ld, descent %ld"), length, height, descent ); dc.DrawText( text, 110, 80 ); - text.Printf( "CharHeight() returns: %d", dc.GetCharHeight() ); + text.Printf( wxT("CharHeight() returns: %d"), dc.GetCharHeight() ); dc.DrawText( text, 110, 120 ); dc.DrawRectangle( 100, 40, 4, height ); @@ -876,21 +878,21 @@ static const struct int rop; } rasterOperations[] = { - { "wxAND", wxAND }, - { "wxAND_INVERT", wxAND_INVERT }, - { "wxAND_REVERSE", wxAND_REVERSE }, - { "wxCLEAR", wxCLEAR }, - { "wxCOPY", wxCOPY }, - { "wxEQUIV", wxEQUIV }, - { "wxINVERT", wxINVERT }, - { "wxNAND", wxNAND }, - { "wxNO_OP", wxNO_OP }, - { "wxOR", wxOR }, - { "wxOR_INVERT", wxOR_INVERT }, - { "wxOR_REVERSE", wxOR_REVERSE }, - { "wxSET", wxSET }, - { "wxSRC_INVERT", wxSRC_INVERT }, - { "wxXOR", wxXOR }, + { wxT("wxAND"), wxAND }, + { wxT("wxAND_INVERT"), wxAND_INVERT }, + { wxT("wxAND_REVERSE"), wxAND_REVERSE }, + { wxT("wxCLEAR"), wxCLEAR }, + { wxT("wxCOPY"), wxCOPY }, + { wxT("wxEQUIV"), wxEQUIV }, + { wxT("wxINVERT"), wxINVERT }, + { wxT("wxNAND"), wxNAND }, + { wxT("wxNO_OP"), wxNO_OP }, + { wxT("wxOR"), wxOR }, + { wxT("wxOR_INVERT"), wxOR_INVERT }, + { wxT("wxOR_REVERSE"), wxOR_REVERSE }, + { wxT("wxSET"), wxSET }, + { wxT("wxSRC_INVERT"), wxSRC_INVERT }, + { wxT("wxXOR"), wxXOR }, }; void MyCanvas::DrawImages(wxDC& dc) @@ -1126,7 +1128,7 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event) long x = dc.DeviceToLogicalX( pos.x ); long y = dc.DeviceToLogicalY( pos.y ); wxString str; - str.Printf( "Current mouse position: %d,%d", (int)x, (int)y ); + str.Printf( wxT("Current mouse position: %d,%d"), (int)x, (int)y ); m_owner->SetStatusText( str ); }