X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83661a1347733ddad2a7c264f920658e3095ff13..052d2fc5818243dadbc1ec54b1120e295304fc55:/samples/drawing/drawing.cpp diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 0e8f8ee757..fa8d1938f7 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma implementation "drawing.cpp" #pragma interface "drawing.cpp" #endif @@ -30,20 +30,21 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// need because it includes almost all "standard" wxWidgets headers #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/colordlg.h" #include "wx/image.h" +#include "wx/artprov.h" // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) +#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__) #include "mondrian.xpm" #endif @@ -58,6 +59,7 @@ enum ScreenToShow Show_Default, Show_Text, Show_Lines, + Show_Brushes, Show_Polygons, Show_Mask, Show_Ops, @@ -113,10 +115,13 @@ public: // event handlers (these functions should _not_ be virtual) void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); + void OnClip(wxCommandEvent& event); void OnShow(wxCommandEvent &event); void OnOption(wxCommandEvent &event); +#if wxUSE_COLOURDLG wxColour SelectColour(); +#endif // wxUSE_COLOURDLG void PrepareDC(wxDC& dc); int m_backgroundMode; @@ -134,7 +139,7 @@ public: MyCanvas *m_canvas; private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -147,11 +152,15 @@ public: void OnPaint(wxPaintEvent &event); void OnMouseMove(wxMouseEvent &event); - void Show(ScreenToShow show) { m_show = show; Refresh(); } + void ToShow(ScreenToShow show) { m_show = show; Refresh(); } + + // set or remove the clipping region + void Clip(bool clip) { m_clip = clip; Refresh(); } protected: - void DrawTestPoly( int x, int y, wxDC &dc ,int transparent ); void DrawTestLines( int x, int y, int width, wxDC &dc ); + void DrawTestPoly(wxDC& dc); + void DrawTestBrushes(wxDC& dc); void DrawText(wxDC& dc); void DrawImages(wxDC& dc); void DrawWithLogicalOps(wxDC& dc); @@ -159,7 +168,7 @@ protected: void DrawCircles(wxDC& dc); void DrawDefault(wxDC& dc); - void DrawRegionsHelper(wxDC& dc, wxCoord x); + void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime); private: MyFrame *m_owner; @@ -167,6 +176,7 @@ private: ScreenToShow m_show; wxBitmap m_smile_bmp; wxIcon m_std_icon; + bool m_clip; DECLARE_EVENT_TABLE() }; @@ -186,6 +196,7 @@ enum File_ShowDefault = MenuShow_First, File_ShowText, File_ShowLines, + File_ShowBrushes, File_ShowPolygons, File_ShowMask, File_ShowOps, @@ -193,6 +204,8 @@ enum File_ShowCircles, MenuShow_Last = File_ShowCircles, + File_Clip, + MenuOption_First, MapMode_Text = MenuOption_First, @@ -214,10 +227,14 @@ enum LogicalOrigin_MoveUp, LogicalOrigin_MoveLeft, LogicalOrigin_MoveRight, + LogicalOrigin_Set, + LogicalOrigin_Restore, +#if wxUSE_COLOURDLG Colour_TextForeground, Colour_TextBackground, Colour_Background, +#endif // wxUSE_COLOURDLG Colour_BackgroundMode, Colour_TextureBackgound, @@ -225,11 +242,11 @@ enum }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -255,12 +272,12 @@ bool MyApp::LoadImages() gs_bmp36 = new wxBitmap; wxPathList pathList; - pathList.Add("."); - pathList.Add(".."); + pathList.Add(_T(".")); + pathList.Add(_T("..")); - wxString path = pathList.FindValidPath("pat4.bmp"); + wxString path = pathList.FindValidPath(_T("pat4.bmp")); if ( !path ) - return FALSE; + return false; /* 4 colour bitmap */ gs_bmp4->LoadFile(path, wxBITMAP_TYPE_BMP); @@ -269,23 +286,23 @@ bool MyApp::LoadImages() wxMask* mask4 = new wxMask(*gs_bmp4_mono, *wxBLACK); gs_bmp4_mono->SetMask(mask4); - path = pathList.FindValidPath("pat36.bmp"); + path = pathList.FindValidPath(_T("pat36.bmp")); if ( !path ) - return FALSE; + return false; gs_bmp36->LoadFile(path, wxBITMAP_TYPE_BMP); wxMask* mask36 = new wxMask(*gs_bmp36, *wxBLACK); gs_bmp36->SetMask(mask36); - path = pathList.FindValidPath("image.bmp"); + path = pathList.FindValidPath(_T("image.bmp")); if ( !path ) - return FALSE; + return false; gs_bmpNoMask->LoadFile(path, wxBITMAP_TYPE_BMP); gs_bmpWithMask->LoadFile(path, wxBITMAP_TYPE_BMP); gs_bmpWithColMask->LoadFile(path, wxBITMAP_TYPE_BMP); - path = pathList.FindValidPath("mask.bmp"); + path = pathList.FindValidPath(_T("mask.bmp")); if ( !path ) - return FALSE; + return false; gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP); wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK); @@ -294,34 +311,34 @@ bool MyApp::LoadImages() mask = new wxMask(*gs_bmpWithColMask, *wxWHITE); gs_bmpWithColMask->SetMask(mask); - return TRUE; + return true; } // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("Drawing sample", + MyFrame *frame = new MyFrame(_T("Drawing sample"), wxPoint(50, 50), wxSize(550, 340)); // Show it and tell the application that it's our main window - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); 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(); - return FALSE; + return false; } // ok, continue - return TRUE; + return true; } void MyApp::DeleteBitmaps() @@ -333,13 +350,21 @@ void MyApp::DeleteBitmaps() delete gs_bmp4; delete gs_bmp4_mono; delete gs_bmp36; + + gs_bmpNoMask = NULL; + gs_bmpWithColMask = NULL; + gs_bmpMask = NULL; + gs_bmpWithMask = NULL; + gs_bmp4 = NULL; + gs_bmp4_mono = NULL; + gs_bmp36 = NULL; } // ---------------------------------------------------------------------------- // MyCanvas // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow) EVT_PAINT (MyCanvas::OnPaint) @@ -349,272 +374,137 @@ END_EVENT_TABLE() #include "smile.xpm" MyCanvas::MyCanvas(MyFrame *parent) - : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize, + : wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL | wxVSCROLL | wxNO_FULL_REPAINT_ON_RESIZE) { m_owner = parent; m_show = Show_Default; m_smile_bmp = wxBitmap(smile_xpm); - m_std_icon = wxTheApp->GetStdIcon(wxICON_INFORMATION); + m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION); + m_clip = false; } -// Draw a polygon and an overlapping rectangle -// If transparent is 1, the fill pattern is made transparent. -// If transparent is 2, the fill pattern is made transparent but inversed -// If is transparent is 0 the text for and background color will be used to represent/map -// the colors of the monochrome bitmap pixels to the fillpattern -// -// I abused the the menu items for setting so called back and fore ground color -// just to show how the those colors do influence the fillpatterns just play -// with those, and with the code variations are endless using other logical -// functions. - -void MyCanvas::DrawTestPoly( int x, int y,wxDC &dc,int transparent ) +void MyCanvas::DrawTestBrushes(wxDC& dc) { -// wxBrush* brush4 = new wxBrush(*gs_bmp4); - wxBrush* brush4 = new wxBrush(*wxBLACK,wxFDIAGONAL_HATCH); - wxBrush* brush4_mono = new wxBrush(*gs_bmp4_mono); - wxBrush* brush36 = new wxBrush(*gs_bmp36); - - wxPoint todraw[5]; - todraw[0].x=(long)x+100; - todraw[0].y=(long)y+100; - todraw[1].x=(long)x+300; - todraw[1].y=(long)y+100; - todraw[2].x=(long)x+300; - todraw[2].y=(long)y+300; - todraw[3].x=(long)x+150; - todraw[3].y=(long)y+350; - todraw[4].x=(long)x+100; - todraw[4].y=(long)y+300; - - wxPoint todraw2[5]; - todraw2[0].x=100; - todraw2[0].y=100; - todraw2[1].x=300; - todraw2[1].y=100; - todraw2[2].x=300; - todraw2[2].y=300; - todraw2[3].x=150; - todraw2[3].y=350; - todraw2[4].x=100; - todraw2[4].y=300; - - switch (transparent) - { - case 0: - { - dc.SetLogicalFunction(wxCOPY); - - dc.SetPen( wxPen( "black", 4, wxSOLID) ); - dc.SetBrush( *brush4 ); - dc.DrawPolygon(5,todraw,0,0,wxWINDING_RULE); - - dc.SetPen( wxPen( "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.SetBrush( *brush4_mono ); - dc.SetTextForeground(*wxCYAN); - dc.SetTextBackground(m_owner->m_colourBackground); - dc.DrawRectangle( x+50, y+50, 200, 200 ); - - dc.DrawCircle( x+400, y+50, 130 ); - - dc.SetBrush(wxNullBrush); - dc.SetPen(wxNullPen); - break; - } - case 1: //now with transparent fillpatterns - { - - wxBitmap* bmpBlit = new wxBitmap(600,400); - wxMemoryDC* memDC= new wxMemoryDC(); - // wxBrush _clearbrush(*wxGREEN,wxSOLID); - wxBrush _clearbrush(*wxBLACK,wxSOLID); - memDC->SelectObject(*bmpBlit); - memDC->BeginDrawing(); - memDC->SetBackground(_clearbrush); - memDC->Clear(); - memDC->SetBackground(wxNullBrush); - - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); - memDC->SetBrush( wxNullBrush); - memDC->SetBrush( *brush4 ); - memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) - memDC->SetTextBackground(*wxWHITE); // 1s --> 0xFFFFFF (white) - memDC->SetLogicalFunction(wxAND_INVERT); - - // BLACK OUT the opaque pixels and leave the rest as is - memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); - - // Set background and foreground colors for fill pattern - //the previous blacked out pixels are now merged with the layer color - //while the non blacked out pixels stay as they are. - memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) - - //now define what will be the color of the fillpattern parts that are not transparent - // memDC->SetTextBackground(*wxBLUE); - memDC->SetTextBackground(m_owner->m_colourForeground); - memDC->SetLogicalFunction(wxOR); - - - //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "red", 4, wxSOLID) ); - memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); - - memDC->SetLogicalFunction(wxCOPY); - - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); - memDC->SetBrush( wxNullBrush); - memDC->SetBrush( *brush36 ); - memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) - memDC->SetTextBackground(*wxWHITE); // 1s --> 0xFFFFFF (white) - memDC->SetLogicalFunction(wxAND_INVERT); - - memDC->DrawRectangle( 10, 10, 200, 200 ); - - // Set background and foreground colors for fill pattern - //the previous blacked out pixels are now merged with the layer color - //while the non blacked out pixels stay as they are. - memDC->SetTextForeground(*wxBLACK); // 0s --> 0x000000 (black) - //now define what will be the color of the fillpattern parts that are not transparent - // memDC->SetTextBackground(*wxRED); - memDC->SetTextBackground(m_owner->m_colourBackground); - memDC->SetLogicalFunction(wxOR); - - //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "yellow", 4, wxSOLID) ); - memDC->DrawRectangle( 10, 10, 200, 200 ); - - memDC->SetBrush(wxNullBrush); - memDC->SetPen(wxNullPen); - - memDC->EndDrawing(); - dc.Blit(x,y,600,400,memDC,0,0,wxCOPY); - delete bmpBlit; - delete memDC; - break; - } - case 2: //now with transparent inversed fillpatterns - { - wxBitmap* bmpBlit = new wxBitmap(600,400); - wxMemoryDC* memDC= new wxMemoryDC(); - wxBrush _clearbrush(*wxWHITE,wxSOLID); - memDC->SelectObject(*bmpBlit); - memDC->BeginDrawing(); - memDC->SetBackground(_clearbrush); - memDC->Clear(); - memDC->SetBackground(wxNullBrush); - - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); - memDC->SetBrush( *brush4 ); - memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) - memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white) - memDC->SetLogicalFunction(wxAND_INVERT); - - // BLACK OUT the opaque pixels and leave the rest as is - memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); - - // Set background and foreground colors for fill pattern - //the previous blacked out pixels are now merged with the layer color - //while the non blacked out pixels stay as they are. - memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) - - //now define what will be the color of the fillpattern parts that are not transparent - memDC->SetTextForeground(m_owner->m_colourForeground); - memDC->SetLogicalFunction(wxOR); - - - //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "red", 4, wxSOLID) ); - memDC->DrawPolygon(5,todraw2,0,0,wxWINDING_RULE); - - memDC->SetLogicalFunction(wxCOPY); - - memDC->SetPen( wxPen( "black", 4, wxSOLID) ); - memDC->SetBrush( *brush36 ); - memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) - memDC->SetTextForeground(*wxWHITE); // 1s --> 0xFFFFFF (white) - memDC->SetLogicalFunction(wxAND_INVERT); - - memDC->DrawRectangle( 10,10, 200, 200 ); - - // Set background and foreground colors for fill pattern - //the previous blacked out pixels are now merged with the layer color - //while the non blacked out pixels stay as they are. - memDC->SetTextBackground(*wxBLACK); // 0s --> 0x000000 (black) - //now define what will be the color of the fillpattern parts that are not transparent - memDC->SetTextForeground(m_owner->m_colourBackground); - memDC->SetLogicalFunction(wxOR); - - //don't understand how but the outline is also depending on logicalfunction - memDC->SetPen( wxPen( "yellow", 4, wxSOLID) ); - memDC->DrawRectangle( 10, 10, 200, 200 ); - - memDC->SetBrush(wxNullBrush); - memDC->SetPen(wxNullPen); - dc.Blit(x,y,600,400,memDC,0,0,wxCOPY); - delete bmpBlit; - delete memDC; - } - } + static const wxCoord WIDTH = 200; + static const wxCoord HEIGHT = 80; + + wxCoord x = 10, + y = 10; + + dc.SetBrush(wxBrush(*wxGREEN, wxSOLID)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(_T("Solid green"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*wxRED, wxCROSSDIAG_HATCH)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(_T("Hatched red"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*gs_bmpMask)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(_T("Stipple mono"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*gs_bmpNoMask)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(_T("Stipple colour"), x + 10, y + 10); +} - delete brush4; - delete brush4_mono; - delete brush36; +void MyCanvas::DrawTestPoly(wxDC& dc) +{ + wxBrush brushHatch(*wxRED, wxFDIAGONAL_HATCH); + dc.SetBrush(brushHatch); + + wxPoint star[5]; + star[0] = wxPoint(100, 60); + star[1] = wxPoint(60, 150); + star[2] = wxPoint(160, 100); + star[3] = wxPoint(40, 100); + star[4] = wxPoint(140, 150); + + dc.DrawText(_T("You should see two (irregular) stars below, the left one ") + _T("hatched"), 10, 10); + dc.DrawText(_T("except for the central region and the right ") + _T("one entirely hatched"), 10, 30); + dc.DrawText(_T("The third star only has a hatched outline"), 10, 50); + + dc.DrawPolygon(WXSIZEOF(star), star, 0, 30); + dc.DrawPolygon(WXSIZEOF(star), star, 160, 30, wxWINDING_RULE); + + wxPoint star2[10]; + star2[0] = wxPoint(0, 100); + star2[1] = wxPoint(-59, -81); + star2[2] = wxPoint(95, 31); + star2[3] = wxPoint(-95, 31); + star2[4] = wxPoint(59, -81); + star2[5] = wxPoint(0, 80); + star2[6] = wxPoint(-47, -64); + star2[7] = wxPoint(76, 24); + star2[8] = wxPoint(-76, 24); + star2[9] = wxPoint(47, -64); + int count[2] = {5, 5}; + + dc.DrawPolyPolygon(WXSIZEOF(count), count, star2, 450, 150); } 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.DrawText(_T("Solid/dot/short dash/long dash/dot dash"), x + 150, y + 10); + 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.DrawText(_T("Misc hatches"), x + 150, y + 70); + 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 ); - wxDash dash1[1]; - dash1[0] = 0; - ud.SetDashes( 1, dash1 ); + dc.DrawText(_T("User dash"), x + 150, y + 140); + wxPen ud( wxT("black"), width, wxUSER_DASH ); + 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 ); - 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 ); - 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 ); - 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 ); } @@ -622,10 +512,12 @@ void MyCanvas::DrawDefault(wxDC& dc) { // mark the origin dc.DrawCircle(0, 0, 10); -#if !(defined __WXGTK__) && !(defined __WXMOTIF__) - // not implemented in wxGTK or wxMOTIF :-( - dc.FloodFill(0, 0, wxColour(255, 0, 0)); -#endif // + + //flood fill using brush, starting at 1,1 and replacing whatever colour we find there + dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID)); + wxColour tmpColour ; + dc.GetPixel(1,1, &tmpColour); + dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE); dc.DrawCheckMark(5, 80, 15, 15); dc.DrawCheckMark(25, 80, 30, 30); @@ -637,7 +529,7 @@ void MyCanvas::DrawDefault(wxDC& dc) dc.SetPen(*wxTRANSPARENT_PEN); dc.SetBrush( *wxGREEN_BRUSH ); dc.DrawRectangle(x, 10, rectSize, rectSize); - dc.DrawBitmap(m_std_icon, x + 5, 15, TRUE); + dc.DrawBitmap(m_std_icon, x + 5, 15, true); x += rectSize + 10; dc.DrawRectangle(x, 10, rectSize, rectSize); dc.DrawIcon(m_std_icon, x + 5, 15); @@ -649,7 +541,7 @@ void MyCanvas::DrawDefault(wxDC& dc) //dc.SetBrush( *wxTRANSPARENT_BRUSH ); if (m_smile_bmp.Ok()) - dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, TRUE); + dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true); dc.SetBrush( *wxBLACK_BRUSH ); dc.DrawRectangle( 0, 160, 1000, 300 ); @@ -701,9 +593,9 @@ void MyCanvas::DrawDefault(wxDC& dc) memdc.SelectObject( wxNullBitmap ); dc.DrawBitmap( bitmap, 10, 170 ); - wxImage image( bitmap ); + wxImage image = bitmap.ConvertToImage(); image.Rescale( 60,210 ); - bitmap = image.ConvertToBitmap(); + bitmap = wxBitmap(image); dc.DrawBitmap( bitmap, 50, 170 ); // test the rectangle outline drawing - there should be one pixel between @@ -782,11 +674,12 @@ void MyCanvas::DrawDefault(wxDC& dc) wxMemoryDC memdc2; memdc2.SelectObject(bitmap2); - wxBrush yellowBrush(wxColour(255, 255, 0), wxSOLID); + wxColour clr(255, 255, 0); + wxBrush yellowBrush(clr, wxSOLID); memdc2.SetBackground(yellowBrush); memdc2.Clear(); - wxPen yellowPen(wxColour(255, 255, 0), 1, wxSOLID); + wxPen yellowPen(clr, 1, wxSOLID); // Now draw a white rectangle with red outline. It should // entirely eclipse the yellow background. @@ -820,33 +713,35 @@ void MyCanvas::DrawDefault(wxDC& dc) void MyCanvas::DrawText(wxDC& dc) { // set underlined font for testing - dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) ); - dc.DrawText( "This is text", 110, 10 ); - dc.DrawRotatedText( "That is text", 20, 10, -45 ); + dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, true) ); + dc.DrawText( _T("This is text"), 110, 10 ); + dc.DrawRotatedText( _T("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); } dc.SetFont( wxFont( 18, wxSWISS, wxNORMAL, wxNORMAL ) ); - dc.DrawText( "This is Swiss 18pt text.", 110, 40 ); + dc.DrawText( _T("This is Swiss 18pt text."), 110, 40 ); long length; 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 ); + dc.GetTextExtent( _T("This is Swiss 18pt text."), &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 ); @@ -854,20 +749,20 @@ void MyCanvas::DrawText(wxDC& dc) // test the logical function effect wxCoord y = 150; dc.SetLogicalFunction(wxINVERT); - dc.DrawText( "There should be no text below", 110, 150 ); + dc.DrawText( _T("There should be no text below"), 110, 150 ); dc.DrawRectangle( 110, y, 100, height ); // twice drawn inverted should result in invisible y += height; - dc.DrawText( "Invisible text", 110, y ); + dc.DrawText( _T("Invisible text"), 110, y ); dc.DrawRectangle( 110, y, 100, height ); - dc.DrawText( "Invisible text", 110, y ); + dc.DrawText( _T("Invisible text"), 110, y ); dc.DrawRectangle( 110, y, 100, height ); dc.SetLogicalFunction(wxCOPY); y += height; dc.DrawRectangle( 110, y, 100, height ); - dc.DrawText( "Visible text", 110, y ); + dc.DrawText( _T("Visible text"), 110, y ); } static const struct @@ -876,33 +771,33 @@ 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) { - dc.DrawText("original image", 0, 0); + dc.DrawText(_T("original image"), 0, 0); dc.DrawBitmap(*gs_bmpNoMask, 0, 20, 0); - dc.DrawText("with colour mask", 0, 100); - dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, TRUE); - dc.DrawText("the mask image", 0, 200); + dc.DrawText(_T("with colour mask"), 0, 100); + dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, true); + dc.DrawText(_T("the mask image"), 0, 200); dc.DrawBitmap(*gs_bmpMask, 0, 220, 0); - dc.DrawText("masked image", 0, 300); - dc.DrawBitmap(*gs_bmpWithMask, 0, 320, TRUE); + dc.DrawText(_T("masked image"), 0, 300); + dc.DrawBitmap(*gs_bmpWithMask, 0, 320, true); int cx = gs_bmpWithColMask->GetWidth(), cy = gs_bmpWithColMask->GetHeight(); @@ -915,7 +810,7 @@ void MyCanvas::DrawImages(wxDC& dc) dc.DrawText(rasterOperations[n].name, x, y - 20); memDC.SelectObject(*gs_bmpWithColMask); - dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, TRUE); + dc.Blit(x, y, cx, cy, &memDC, 0, 0, rasterOperations[n].rop, true); } } @@ -961,19 +856,19 @@ void MyCanvas::DrawCircles(wxDC& dc) y = 100, r = 20; - dc.DrawText("Some circles", 0, y); + dc.DrawText(_T("Some circles"), 0, y); dc.DrawCircle(x, y, r); dc.DrawCircle(x + 2*r, y, r); dc.DrawCircle(x + 4*r, y, r); y += 2*r; - dc.DrawText("And ellipses", 0, y); + dc.DrawText(_T("And ellipses"), 0, y); dc.DrawEllipse(x - r, y, 2*r, r); dc.DrawEllipse(x + r, y, 2*r, r); dc.DrawEllipse(x + 3*r, y, 2*r, r); y += 2*r; - dc.DrawText("And arcs", 0, y); + dc.DrawText(_T("And arcs"), 0, y); dc.DrawArc(x - r, y, x + r, y, x, y); dc.DrawArc(x + 4*r, y, x + 2*r, y, x + 3*r, y); dc.DrawArc(x + 5*r, y, x + 5*r, y, x + 6*r, y); @@ -987,52 +882,56 @@ void MyCanvas::DrawCircles(wxDC& dc) void MyCanvas::DrawRegions(wxDC& dc) { - dc.DrawText("You should see a red rect partly covered by a cyan one " - "on the left", 10, 5); - dc.DrawText("and 5 smileys from which 4 are partially clipped on the " - "right (2 copies should be identical)", + dc.DrawText(_T("You should see a red rect partly covered by a cyan one ") + _T("on the left"), 10, 5); + dc.DrawText(_T("and 5 smileys from which 4 are partially clipped on the right"), 10, 5 + dc.GetCharHeight()); + dc.DrawText(_T("The second copy should be identical but right part of it ") + _T("should be offset by 10 pixels."), + 10, 5 + 2*dc.GetCharHeight()); - DrawRegionsHelper(dc, 10); - DrawRegionsHelper(dc, 350); + DrawRegionsHelper(dc, 10, true); + DrawRegionsHelper(dc, 350, false); } -void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x) +void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) { + wxCoord y = 100; + dc.DestroyClippingRegion(); dc.SetBrush( *wxWHITE_BRUSH ); dc.SetPen( *wxTRANSPARENT_PEN ); - dc.DrawRectangle( x,50,310,310 ); + dc.DrawRectangle( x, y, 310, 310 ); - dc.SetClippingRegion( x+10,60,100,270 ); + dc.SetClippingRegion( x + 10, y + 10, 100, 270 ); dc.SetBrush( *wxRED_BRUSH ); - dc.DrawRectangle( x,50,310,310 ); + dc.DrawRectangle( x, y, 310, 310 ); - dc.SetClippingRegion( x+10,60,100,100 ); + dc.SetClippingRegion( x + 10, y + 10, 100, 100 ); dc.SetBrush( *wxCYAN_BRUSH ); - dc.DrawRectangle( x,50,310,310 ); + dc.DrawRectangle( x, y, 310, 310 ); - // when drawing the left half, destroy the clipping region, when drawing - // the right one - leave it - // - // normally it shouldn't make any difference as SetClippingRegion() - // replaces the old clipping region - if ( x < 300 ) - dc.DestroyClippingRegion(); - dc.SetClippingRegion( x+110,70,100,270 ); + dc.DestroyClippingRegion(); + + wxRegion region(x + 110, y + 20, 100, 270); +#if !defined(__WXMOTIF__) && !defined(__WXMAC__) + if ( !firstTime ) + region.Offset(10, 10); +#endif + dc.SetClippingRegion(region); dc.SetBrush( *wxGREY_BRUSH ); - dc.DrawRectangle( x,50,310,310 ); + dc.DrawRectangle( x, y, 310, 310 ); if (m_smile_bmp.Ok()) { - dc.DrawBitmap( m_smile_bmp, x+150, 200, TRUE ); - dc.DrawBitmap( m_smile_bmp, x+130, 60, TRUE ); - dc.DrawBitmap( m_smile_bmp, x+130, 330, TRUE ); - dc.DrawBitmap( m_smile_bmp, x+100, 120, TRUE ); - dc.DrawBitmap( m_smile_bmp, x+200, 120, TRUE ); + dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true ); + dc.DrawBitmap( m_smile_bmp, x + 130, y + 10, true ); + dc.DrawBitmap( m_smile_bmp, x + 130, y + 280, true ); + dc.DrawBitmap( m_smile_bmp, x + 100, y + 70, true ); + dc.DrawBitmap( m_smile_bmp, x + 200, y + 70, true ); } } @@ -1053,16 +952,21 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) if ( m_owner->m_textureBackground) { if ( ! m_owner->m_backgroundBrush.Ok() ) { - wxBrush b(wxColour(0,128,0), wxSOLID); + wxColour clr(0,128,0); + wxBrush b(clr, wxSOLID); dc.SetBackground(b); } } + if ( m_clip ) + dc.SetClippingRegion(100, 100, 100, 100); + dc.Clear(); - if ( m_owner->m_textureBackground) { + if ( m_owner->m_textureBackground ) + { dc.SetPen(*wxMEDIUM_GREY_PEN); - for (int i=0; i<200; i++) + for ( int i = 0; i < 200; i++ ) dc.DrawLine(0, i*10, i*10, 0); } @@ -1091,12 +995,12 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) DrawTestLines( 0, 760, 6, dc ); break; + case Show_Brushes: + DrawTestBrushes(dc); + break; + case Show_Polygons: - DrawTestPoly( 0, 100, dc, 0 ); -/* - DrawTestPoly( 33, 500, dc, 1 ); - DrawTestPoly( 43, 1000, dc, 2 ); -*/ + DrawTestPoly(dc); break; case Show_Mask: @@ -1106,18 +1010,12 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) case Show_Ops: DrawWithLogicalOps(dc); break; - - default: - { - dc.SetPen( *wxBLACK_PEN ); - dc.DrawLine( 0,0,100,100 ); - } - } } void MyCanvas::OnMouseMove(wxMouseEvent &event) { +#if wxUSE_STATUSBAR wxClientDC dc(this); PrepareDC(dc); m_owner->PrepareDC(dc); @@ -1126,20 +1024,24 @@ 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 ); +#else + wxUnusedVar(event); +#endif // wxUSE_STATUSBAR } // ---------------------------------------------------------------------------- // MyFrame // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU (File_Quit, MyFrame::OnQuit) EVT_MENU (File_About, MyFrame::OnAbout) + EVT_MENU (File_Clip, MyFrame::OnClip) EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow) @@ -1148,73 +1050,82 @@ END_EVENT_TABLE() // frame constructor MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, -1, title, pos, size, + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size, wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE) { // set the frame icon SetIcon(wxICON(mondrian)); wxMenu *menuFile = new wxMenu; - menuFile->Append(File_ShowDefault, "&Default screen\tF1"); - menuFile->Append(File_ShowText, "&Text screen\tF2"); - menuFile->Append(File_ShowLines, "&Lines screen\tF3"); - 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\tF7"); - menuFile->Append(File_ShowCircles, "&Circles screen\tF8"); + menuFile->Append(File_ShowDefault, _T("&Default screen\tF1")); + menuFile->Append(File_ShowText, _T("&Text screen\tF2")); + menuFile->Append(File_ShowLines, _T("&Lines screen\tF3")); + menuFile->Append(File_ShowBrushes, _T("&Brushes screen\tF4")); + menuFile->Append(File_ShowPolygons, _T("&Polygons screen\tF5")); + menuFile->Append(File_ShowMask, _T("&Mask screen\tF6")); + menuFile->Append(File_ShowOps, _T("&ROP screen\tF7")); + menuFile->Append(File_ShowRegions, _T("Re&gions screen\tF8")); + menuFile->Append(File_ShowCircles, _T("&Circles screen\tF9")); + menuFile->AppendSeparator(); + menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing")); menuFile->AppendSeparator(); - menuFile->Append(File_About, "&About...\tCtrl-A", "Show about dialog"); + menuFile->Append(File_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); menuFile->AppendSeparator(); - menuFile->Append(File_Quit, "E&xit\tAlt-X", "Quit this program"); + menuFile->Append(File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); wxMenu *menuMapMode = new wxMenu; - menuMapMode->Append( MapMode_Text, "&TEXT map mode" ); - menuMapMode->Append( MapMode_Lometric, "&LOMETRIC map mode" ); - menuMapMode->Append( MapMode_Twips, "T&WIPS map mode" ); - menuMapMode->Append( MapMode_Points, "&POINTS map mode" ); - menuMapMode->Append( MapMode_Metric, "&METRIC map mode" ); + menuMapMode->Append( MapMode_Text, _T("&TEXT map mode") ); + menuMapMode->Append( MapMode_Lometric, _T("&LOMETRIC map mode") ); + menuMapMode->Append( MapMode_Twips, _T("T&WIPS map mode") ); + menuMapMode->Append( MapMode_Points, _T("&POINTS map mode") ); + menuMapMode->Append( MapMode_Metric, _T("&METRIC map mode") ); wxMenu *menuUserScale = new wxMenu; - menuUserScale->Append( UserScale_StretchHoriz, "Stretch horizontally\tCtrl-H" ); - menuUserScale->Append( UserScale_ShrinkHoriz, "Shrink horizontally\tCtrl-G" ); - menuUserScale->Append( UserScale_StretchVertic, "Stretch vertically\tCtrl-V" ); - menuUserScale->Append( UserScale_ShrinkVertic, "Shrink vertically\tCtrl-W" ); + menuUserScale->Append( UserScale_StretchHoriz, _T("Stretch &horizontally\tCtrl-H") ); + menuUserScale->Append( UserScale_ShrinkHoriz, _T("Shrin&k horizontally\tCtrl-G") ); + menuUserScale->Append( UserScale_StretchVertic, _T("Stretch &vertically\tCtrl-V") ); + menuUserScale->Append( UserScale_ShrinkVertic, _T("&Shrink vertically\tCtrl-W") ); menuUserScale->AppendSeparator(); - menuUserScale->Append( UserScale_Restore, "Restore to normal\tCtrl-0" ); + menuUserScale->Append( UserScale_Restore, _T("&Restore to normal\tCtrl-0") ); wxMenu *menuAxis = new wxMenu; - menuAxis->Append( AxisMirror_Horiz, "Mirror horizontally\tCtrl-M", "", TRUE ); - menuAxis->Append( AxisMirror_Vertic, "Mirror vertically\tCtrl-N", "", TRUE ); + menuAxis->AppendCheckItem( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M") ); + menuAxis->AppendCheckItem( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N") ); wxMenu *menuLogical = new wxMenu; - menuLogical->Append( LogicalOrigin_MoveDown, "Move &down\tCtrl-D" ); - menuLogical->Append( LogicalOrigin_MoveUp, "Move &up\tCtrl-U" ); - menuLogical->Append( LogicalOrigin_MoveLeft, "Move &right\tCtrl-L" ); - menuLogical->Append( LogicalOrigin_MoveRight, "Move &left\tCtrl-R" ); + menuLogical->Append( LogicalOrigin_MoveDown, _T("Move &down\tCtrl-D") ); + menuLogical->Append( LogicalOrigin_MoveUp, _T("Move &up\tCtrl-U") ); + menuLogical->Append( LogicalOrigin_MoveLeft, _T("Move &right\tCtrl-L") ); + menuLogical->Append( LogicalOrigin_MoveRight, _T("Move &left\tCtrl-R") ); + menuLogical->AppendSeparator(); + menuLogical->Append( LogicalOrigin_Set, _T("Set to (&100, 100)\tShift-Ctrl-1") ); + menuLogical->Append( LogicalOrigin_Restore, _T("&Restore to normal\tShift-Ctrl-0") ); wxMenu *menuColour = new wxMenu; - menuColour->Append( Colour_TextForeground, "Text foreground..." ); - menuColour->Append( Colour_TextBackground, "Text background..." ); - menuColour->Append( Colour_Background, "Background colour..." ); - menuColour->Append( Colour_BackgroundMode, "Opaque/transparent\tCtrl-B", "", TRUE ); - menuColour->Append( Colour_TextureBackgound, "Draw textured background\tCtrl-T", "", TRUE); +#if wxUSE_COLOURDLG + menuColour->Append( Colour_TextForeground, _T("Text &foreground...") ); + menuColour->Append( Colour_TextBackground, _T("Text &background...") ); + menuColour->Append( Colour_Background, _T("Background &colour...") ); +#endif // wxUSE_COLOURDLG + menuColour->AppendCheckItem( Colour_BackgroundMode, _T("&Opaque/transparent\tCtrl-B") ); + menuColour->AppendCheckItem( Colour_TextureBackgound, _T("Draw textured back&ground\tCtrl-T") ); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, "&File"); - menuBar->Append(menuMapMode, "&MapMode"); - menuBar->Append(menuUserScale, "&UserScale"); - menuBar->Append(menuAxis, "&Axis"); - menuBar->Append(menuLogical, "&LogicalOrigin"); - menuBar->Append(menuColour, "&Colours"); + menuBar->Append(menuFile, _T("&File")); + menuBar->Append(menuMapMode, _T("&Mode")); + menuBar->Append(menuUserScale, _T("&Scale")); + menuBar->Append(menuAxis, _T("&Axis")); + menuBar->Append(menuLogical, _T("&Origin")); + menuBar->Append(menuColour, _T("&Colours")); // ... and attach this menu bar to the frame SetMenuBar(menuBar); - // create a status bar just for fun (by default with 1 pane only) +#if wxUSE_STATUSBAR CreateStatusBar(2); - SetStatusText("Welcome to wxWindows!"); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR m_mapMode = wxMM_TEXT; m_xUserScale = 1.0; @@ -1222,11 +1133,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) m_xLogicalOrigin = 0; m_yLogicalOrigin = 0; m_xAxisReversed = - m_yAxisReversed = FALSE; + m_yAxisReversed = false; m_backgroundMode = wxSOLID; m_colourForeground = *wxRED; m_colourBackground = *wxBLUE; - m_textureBackground = FALSE; + m_textureBackground = false; m_canvas = new MyCanvas( this ); m_canvas->SetScrollbars( 10, 10, 100, 240 ); @@ -1236,8 +1147,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - // TRUE is to force the frame to close - Close(TRUE); + // true is to force the frame to close + Close(true); } void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) @@ -1245,16 +1156,21 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) wxString msg; msg.Printf( wxT("This is the about dialog of the drawing sample.\n") wxT("This sample tests various primitive drawing functions\n") - wxT("without any tests to prevent flicker.\n") + wxT("(without any attempts to prevent flicker).\n") wxT("Copyright (c) Robert Roebling 1999") ); - wxMessageBox(msg, "About Drawing", wxOK | wxICON_INFORMATION, this); + wxMessageBox(msg, _T("About Drawing"), wxOK | wxICON_INFORMATION, this); +} + +void MyFrame::OnClip(wxCommandEvent& event) +{ + m_canvas->Clip(event.IsChecked()); } void MyFrame::OnShow(wxCommandEvent& event) { - m_canvas->Show((ScreenToShow)(event.GetId() - MenuShow_First)); + m_canvas->ToShow((ScreenToShow)(event.GetId() - MenuShow_First)); } void MyFrame::OnOption(wxCommandEvent& event) @@ -1289,6 +1205,14 @@ void MyFrame::OnOption(wxCommandEvent& event) case LogicalOrigin_MoveRight: m_xLogicalOrigin -= 10; break; + case LogicalOrigin_Set: + m_xLogicalOrigin = + m_yLogicalOrigin = -100; + break; + case LogicalOrigin_Restore: + m_xLogicalOrigin = + m_yLogicalOrigin = 0; + break; case UserScale_StretchHoriz: m_xUserScale *= 1.10; @@ -1314,6 +1238,7 @@ void MyFrame::OnOption(wxCommandEvent& event) m_xAxisReversed = !m_xAxisReversed; break; +#if wxUSE_COLOURDLG case Colour_TextForeground: m_colourForeground = SelectColour(); break; @@ -1329,6 +1254,8 @@ void MyFrame::OnOption(wxCommandEvent& event) } } break; +#endif // wxUSE_COLOURDLG + case Colour_BackgroundMode: m_backgroundMode = m_backgroundMode == wxSOLID ? wxTRANSPARENT : wxSOLID; @@ -1348,12 +1275,13 @@ void MyFrame::OnOption(wxCommandEvent& event) void MyFrame::PrepareDC(wxDC& dc) { - dc.SetMapMode( m_mapMode ); - dc.SetUserScale( m_xUserScale, m_yUserScale ); dc.SetLogicalOrigin( m_xLogicalOrigin, m_yLogicalOrigin ); dc.SetAxisOrientation( !m_xAxisReversed, m_yAxisReversed ); + dc.SetUserScale( m_xUserScale, m_yUserScale ); + dc.SetMapMode( m_mapMode ); } +#if wxUSE_COLOURDLG wxColour MyFrame::SelectColour() { wxColour col; @@ -1367,3 +1295,5 @@ wxColour MyFrame::SelectColour() return col; } +#endif // wxUSE_COLOURDLG +