X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6386110d028b9b48d95e21e7af56457d69f264e1..0b659b0a51c13cdc4ed21f3f8c020c5055c6c024:/samples/drawing/drawing.cpp diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 93c4b6df2f..8287997293 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 @@ -37,13 +37,14 @@ #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 @@ -114,6 +115,7 @@ 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); @@ -150,6 +152,9 @@ public: void Show(ScreenToShow show) { m_show = show; Refresh(); } + // set or remove the clipping region + void Clip(bool clip) { m_clip = clip; Refresh(); } + protected: void DrawTestLines( int x, int y, int width, wxDC &dc ); void DrawTestPoly(wxDC& dc); @@ -161,7 +166,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; @@ -169,6 +174,7 @@ private: ScreenToShow m_show; wxBitmap m_smile_bmp; wxIcon m_std_icon; + bool m_clip; DECLARE_EVENT_TABLE() }; @@ -196,6 +202,8 @@ enum File_ShowCircles, MenuShow_Last = File_ShowCircles, + File_Clip, + MenuOption_First, MapMode_Text = MenuOption_First, @@ -217,6 +225,8 @@ enum LogicalOrigin_MoveUp, LogicalOrigin_MoveLeft, LogicalOrigin_MoveRight, + LogicalOrigin_Set, + LogicalOrigin_Restore, Colour_TextForeground, Colour_TextBackground, @@ -258,10 +268,10 @@ 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; @@ -272,21 +282,21 @@ 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; 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; 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; gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP); @@ -304,7 +314,7 @@ bool MyApp::LoadImages() 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 @@ -366,7 +376,8 @@ MyCanvas::MyCanvas(MyFrame *parent) 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; } void MyCanvas::DrawTestBrushes(wxDC& dc) @@ -379,22 +390,22 @@ void MyCanvas::DrawTestBrushes(wxDC& dc) dc.SetBrush(wxBrush(*wxGREEN, wxSOLID)); dc.DrawRectangle(x, y, WIDTH, HEIGHT); - dc.DrawText("Solid green", x + 10, y + 10); + 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("Hatched red", x + 10, y + 10); + dc.DrawText(_T("Hatched red"), x + 10, y + 10); y += HEIGHT; dc.SetBrush(wxBrush(*gs_bmpMask)); dc.DrawRectangle(x, y, WIDTH, HEIGHT); - dc.DrawText("Stipple mono", x + 10, y + 10); + dc.DrawText(_T("Stipple mono"), x + 10, y + 10); y += HEIGHT; dc.SetBrush(wxBrush(*gs_bmpNoMask)); dc.DrawRectangle(x, y, WIDTH, HEIGHT); - dc.DrawText("Stipple colour", x + 10, y + 10); + dc.DrawText(_T("Stipple colour"), x + 10, y + 10); } void MyCanvas::DrawTestPoly(wxDC& dc) @@ -409,10 +420,10 @@ void MyCanvas::DrawTestPoly(wxDC& dc) star[3] = wxPoint(40, 100); star[4] = wxPoint(140, 150); - dc.DrawText("You should see two (irregular) stars below, the left one " - "hatched", 10, 10); - dc.DrawText("except for the central region and the right " - "one entirely hatched", 10, 30); + 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.DrawPolygon(WXSIZEOF(star), star); dc.DrawPolygon(WXSIZEOF(star), star, 160, 0, wxWINDING_RULE); @@ -425,7 +436,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) 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.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( wxT("black"), width, wxDOT) ); @@ -437,7 +448,7 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) 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.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( wxT("black"), width, wxCROSSDIAG_HATCH) ); @@ -451,20 +462,29 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) 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); + 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 ); - 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 ); } @@ -472,10 +492,12 @@ void MyCanvas::DrawDefault(wxDC& dc) { // mark the origin dc.DrawCircle(0, 0, 10); -#if !(defined __WXGTK__) && !(defined __WXMOTIF__) && !(defined __WXMGL__) - // 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); @@ -551,9 +573,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 @@ -671,8 +693,8 @@ 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.DrawText( _T("This is text"), 110, 10 ); + dc.DrawRotatedText( _T("That is text"), 20, 10, -45 ); // use wxSWISS_FONT and not wxNORMAL_FONT as the latter can't be rotated // under Win9x (it is not TrueType) @@ -689,12 +711,12 @@ void MyCanvas::DrawText(wxDC& dc) 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 ); + 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 ); @@ -706,20 +728,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 @@ -747,13 +769,13 @@ static const struct 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.DrawText(_T("with colour mask"), 0, 100); dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, TRUE); - dc.DrawText("the mask image", 0, 200); + dc.DrawText(_T("the mask image"), 0, 200); dc.DrawBitmap(*gs_bmpMask, 0, 220, 0); - dc.DrawText("masked image", 0, 300); + dc.DrawText(_T("masked image"), 0, 300); dc.DrawBitmap(*gs_bmpWithMask, 0, 320, TRUE); int cx = gs_bmpWithColMask->GetWidth(), @@ -813,19 +835,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); @@ -839,52 +861,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 ); } } @@ -910,11 +936,15 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) } } + 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); } @@ -985,6 +1015,7 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event) 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) @@ -1000,67 +1031,72 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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_ShowBrushes, "&Brushes screen\tF4"); - menuFile->Append(File_ShowPolygons, "&Polygons screen\tF5"); - menuFile->Append(File_ShowMask, "&Mask screen\tF6"); - menuFile->Append(File_ShowOps, "&ROP screen\tF7"); - menuFile->Append(File_ShowRegions, "Re&gions screen\tF8"); - menuFile->Append(File_ShowCircles, "&Circles screen\tF9"); + 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->Append( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M"), _T(""), TRUE ); + menuAxis->Append( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N"), _T(""), TRUE ); 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); + menuColour->Append( Colour_TextForeground, _T("Text &foreground...") ); + menuColour->Append( Colour_TextBackground, _T("Text &background...") ); + menuColour->Append( Colour_Background, _T("Background &colour...") ); + menuColour->Append( Colour_BackgroundMode, _T("&Opaque/transparent\tCtrl-B"), _T(""), TRUE ); + menuColour->Append( Colour_TextureBackgound, _T("Draw textured back&ground\tCtrl-T"), _T(""), TRUE); // 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) CreateStatusBar(2); - SetStatusText("Welcome to wxWindows!"); + SetStatusText(_T("Welcome to wxWindows!")); m_mapMode = wxMM_TEXT; m_xUserScale = 1.0; @@ -1095,7 +1131,12 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) 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) @@ -1135,6 +1176,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; @@ -1194,10 +1243,10 @@ 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 ); } wxColour MyFrame::SelectColour() @@ -1213,3 +1262,4 @@ wxColour MyFrame::SelectColour() return col; } +