X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1ca7b3dda18b48e83f9ad2f5f3ea9b22247197..40711af81b4a412892045837997211d597d98ff2:/samples/drawing/drawing.cpp?ds=sidebyside diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 573ef9c94a..31f673167b 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: drawing.cpp +// Name: samples/drawing/drawing.cpp // Purpose: shows and tests wxDC features // Author: Robert Roebling // Modified by: @@ -18,8 +18,8 @@ // ---------------------------------------------------------------------------- #if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation "drawing.cpp" - #pragma interface "drawing.cpp" + #pragma implementation + #pragma interface #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -30,7 +30,7 @@ #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 @@ -64,7 +64,8 @@ enum ScreenToShow Show_Mask, Show_Ops, Show_Regions, - Show_Circles + Show_Circles, + Show_Splines }; // ---------------------------------------------------------------------------- @@ -119,7 +120,9 @@ public: void OnShow(wxCommandEvent &event); void OnOption(wxCommandEvent &event); +#if wxUSE_COLOURDLG wxColour SelectColour(); +#endif // wxUSE_COLOURDLG void PrepareDC(wxDC& dc); int m_backgroundMode; @@ -137,7 +140,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() }; @@ -150,7 +153,7 @@ 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(); } @@ -164,6 +167,7 @@ protected: void DrawWithLogicalOps(wxDC& dc); void DrawRegions(wxDC& dc); void DrawCircles(wxDC& dc); + void DrawSplines(wxDC& dc); void DrawDefault(wxDC& dc); void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime); @@ -187,10 +191,10 @@ private: enum { // menu items - File_Quit = 1, - File_About, + File_Quit = wxID_EXIT, + File_About = wxID_ABOUT, - MenuShow_First, + MenuShow_First = wxID_HIGHEST, File_ShowDefault = MenuShow_First, File_ShowText, File_ShowLines, @@ -200,7 +204,8 @@ enum File_ShowOps, File_ShowRegions, File_ShowCircles, - MenuShow_Last = File_ShowCircles, + File_ShowSplines, + MenuShow_Last = File_ShowSplines, File_Clip, @@ -228,9 +233,11 @@ enum LogicalOrigin_Set, LogicalOrigin_Restore, +#if wxUSE_COLOURDLG Colour_TextForeground, Colour_TextBackground, Colour_Background, +#endif // wxUSE_COLOURDLG Colour_BackgroundMode, Colour_TextureBackgound, @@ -238,11 +245,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 @@ -273,7 +280,7 @@ bool MyApp::LoadImages() wxString path = pathList.FindValidPath(_T("pat4.bmp")); if ( !path ) - return FALSE; + return false; /* 4 colour bitmap */ gs_bmp4->LoadFile(path, wxBITMAP_TYPE_BMP); @@ -284,21 +291,21 @@ bool MyApp::LoadImages() 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(_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(_T("mask.bmp")); if ( !path ) - return FALSE; + return false; gs_bmpMask->LoadFile(path, wxBITMAP_TYPE_BMP); wxMask *mask = new wxMask(*gs_bmpMask, *wxBLACK); @@ -307,7 +314,7 @@ 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 @@ -318,7 +325,7 @@ bool MyApp::OnInit() 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() ) @@ -330,11 +337,11 @@ bool MyApp::OnInit() // stop here DeleteBitmaps(); - return FALSE; + return false; } // ok, continue - return TRUE; + return true; } void MyApp::DeleteBitmaps() @@ -360,7 +367,7 @@ void MyApp::DeleteBitmaps() // 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) @@ -370,14 +377,14 @@ 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 = wxArtProvider::GetIcon(wxART_INFORMATION); - m_clip = FALSE; + m_clip = false; } void MyCanvas::DrawTestBrushes(wxDC& dc) @@ -424,9 +431,25 @@ void MyCanvas::DrawTestPoly(wxDC& dc) _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); + 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 ) @@ -464,18 +487,27 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) 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 ); } @@ -484,11 +516,16 @@ void MyCanvas::DrawDefault(wxDC& dc) // mark the origin dc.DrawCircle(0, 0, 10); +#if !wxMAC_USE_CORE_GRAPHICS + // GetPixel and FloodFill not supported by Mac OS X CoreGraphics + // (FloodFill uses Blit from a non-wxMemoryDC) //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); +#endif dc.DrawCheckMark(5, 80, 15, 15); dc.DrawCheckMark(25, 80, 30, 30); @@ -500,7 +537,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); @@ -512,7 +549,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 ); @@ -635,7 +672,7 @@ void MyCanvas::DrawDefault(wxDC& dc) // Added by JACS to demonstrate bizarre behaviour. // With a size of 70, we get a missing red RHS, - // and the hight is too small, so we get yellow + // and the height is too small, so we get yellow // showing. With a size of 40, it draws as expected: // it just shows a white rectangle with red outline. int totalWidth = 70; @@ -645,11 +682,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. @@ -683,7 +721,7 @@ void MyCanvas::DrawDefault(wxDC& dc) void MyCanvas::DrawText(wxDC& dc) { // set underlined font for testing - dc.SetFont( wxFont(12, wxMODERN, wxNORMAL, wxNORMAL, TRUE) ); + 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 ); @@ -763,11 +801,11 @@ void MyCanvas::DrawImages(wxDC& dc) dc.DrawText(_T("original image"), 0, 0); dc.DrawBitmap(*gs_bmpNoMask, 0, 20, 0); dc.DrawText(_T("with colour mask"), 0, 100); - dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, TRUE); + dc.DrawBitmap(*gs_bmpWithColMask, 0, 120, true); dc.DrawText(_T("the mask image"), 0, 200); dc.DrawBitmap(*gs_bmpMask, 0, 220, 0); dc.DrawText(_T("masked image"), 0, 300); - dc.DrawBitmap(*gs_bmpWithMask, 0, 320, TRUE); + dc.DrawBitmap(*gs_bmpWithMask, 0, 320, true); int cx = gs_bmpWithColMask->GetWidth(), cy = gs_bmpWithColMask->GetHeight(); @@ -780,7 +818,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); } } @@ -850,6 +888,94 @@ void MyCanvas::DrawCircles(wxDC& dc) dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360); } +void MyCanvas::DrawSplines(wxDC& dc) +{ +#if wxUSE_SPLINES + dc.DrawText(_T("Some splines"), 10, 5); + + // values are hardcoded rather than randomly generated + // so the output can be compared between native + // implementations on platforms with different random + // generators + + const int R = 300; + const wxPoint center( R + 20, R + 20 ); + const int angles[7] = { 0, 10, 33, 77, 13, 145, 90 }; + const int radii[5] = { 100 , 59, 85, 33, 90 }; + const int n = 200; + wxPoint pts[n]; + + // background spline calculation + unsigned int radius_pos = 0; + unsigned int angle_pos = 0; + int angle = 0; + for ( int i = 0; i < n; i++ ) + { + angle += angles[ angle_pos ]; + int r = R * radii[ radius_pos ] / 100; + pts[ i ].x = center.x + (wxCoord)( r * cos( M_PI * angle / 180.0) ); + pts[ i ].y = center.y + (wxCoord)( r * sin( M_PI * angle / 180.0) ); + + angle_pos++; + if ( angle_pos >= WXSIZEOF(angles) ) angle_pos = 0; + + radius_pos++; + if ( radius_pos >= WXSIZEOF(radii) ) radius_pos = 0; + } + + // background spline drawing + dc.SetPen(*wxRED_PEN); + dc.DrawSpline(WXSIZEOF(pts), pts); + + // less detailed spline calculation + wxPoint letters[4][5]; + // w + letters[0][0] = wxPoint( 0,1); // O O + letters[0][1] = wxPoint( 1,3); // * * + letters[0][2] = wxPoint( 2,2); // * O * + letters[0][3] = wxPoint( 3,3); // * * * * + letters[0][4] = wxPoint( 4,1); // O O + // x1 + letters[1][0] = wxPoint( 5,1); // O*O + letters[1][1] = wxPoint( 6,1); // * + letters[1][2] = wxPoint( 7,2); // O + letters[1][3] = wxPoint( 8,3); // * + letters[1][4] = wxPoint( 9,3); // O*O + // x2 + letters[2][0] = wxPoint( 5,3); // O*O + letters[2][1] = wxPoint( 6,3); // * + letters[2][2] = wxPoint( 7,2); // O + letters[2][3] = wxPoint( 8,1); // * + letters[2][4] = wxPoint( 9,1); // O*O + // W + letters[3][0] = wxPoint(10,0); // O O + letters[3][1] = wxPoint(11,3); // * * + letters[3][2] = wxPoint(12,1); // * O * + letters[3][3] = wxPoint(13,3); // * * * * + letters[3][4] = wxPoint(14,0); // O O + + const int dx = 2 * R / letters[3][4].x; + const int h[4] = { -R/2, 0, R/4, R/2 }; + + for ( int m = 0; m < 4; m++ ) + { + for ( int n = 0; n < 5; n++ ) + { + letters[m][n].x = center.x - R + letters[m][n].x * dx; + letters[m][n].y = center.y + h[ letters[m][n].y ]; + } + + dc.SetPen( wxPen( wxT("blue"), 1, wxDOT) ); + dc.DrawLines(5, letters[m]); + dc.SetPen( wxPen( wxT("black"), 4, wxSOLID) ); + dc.DrawSpline(5, letters[m]); + } + +#else + dc.DrawText(_T("Splines not supported."), 10, 5); +#endif +} + void MyCanvas::DrawRegions(wxDC& dc) { dc.DrawText(_T("You should see a red rect partly covered by a cyan one ") @@ -860,8 +986,8 @@ void MyCanvas::DrawRegions(wxDC& dc) _T("should be offset by 10 pixels."), 10, 5 + 2*dc.GetCharHeight()); - DrawRegionsHelper(dc, 10, TRUE); - DrawRegionsHelper(dc, 350, FALSE); + DrawRegionsHelper(dc, 10, true); + DrawRegionsHelper(dc, 350, false); } void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) @@ -897,11 +1023,11 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) if (m_smile_bmp.Ok()) { - 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 ); + 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 ); } } @@ -922,7 +1048,8 @@ 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); } } @@ -949,6 +1076,10 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) DrawCircles(dc); break; + case Show_Splines: + DrawSplines(dc); + break; + case Show_Regions: DrawRegions(dc); break; @@ -984,6 +1115,7 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) void MyCanvas::OnMouseMove(wxMouseEvent &event) { +#if wxUSE_STATUSBAR wxClientDC dc(this); PrepareDC(dc); m_owner->PrepareDC(dc); @@ -994,13 +1126,16 @@ void MyCanvas::OnMouseMove(wxMouseEvent &event) wxString str; 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) @@ -1015,7 +1150,7 @@ 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 @@ -1031,6 +1166,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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->Append(File_ShowSplines, _T("&Splines screen")); menuFile->AppendSeparator(); menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing")); menuFile->AppendSeparator(); @@ -1054,8 +1190,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuUserScale->Append( UserScale_Restore, _T("&Restore to normal\tCtrl-0") ); wxMenu *menuAxis = new wxMenu; - menuAxis->Append( AxisMirror_Horiz, _T("Mirror horizontally\tCtrl-M"), _T(""), TRUE ); - menuAxis->Append( AxisMirror_Vertic, _T("Mirror vertically\tCtrl-N"), _T(""), 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, _T("Move &down\tCtrl-D") ); @@ -1067,11 +1203,13 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuLogical->Append( LogicalOrigin_Restore, _T("&Restore to normal\tShift-Ctrl-0") ); wxMenu *menuColour = new wxMenu; +#if wxUSE_COLOURDLG 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); +#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; @@ -1085,9 +1223,10 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... 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(_T("Welcome to wxWindows!")); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR m_mapMode = wxMM_TEXT; m_xUserScale = 1.0; @@ -1095,11 +1234,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 ); @@ -1109,8 +1248,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)) @@ -1132,7 +1271,7 @@ void MyFrame::OnClip(wxCommandEvent& event) 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) @@ -1200,6 +1339,7 @@ void MyFrame::OnOption(wxCommandEvent& event) m_xAxisReversed = !m_xAxisReversed; break; +#if wxUSE_COLOURDLG case Colour_TextForeground: m_colourForeground = SelectColour(); break; @@ -1215,6 +1355,8 @@ void MyFrame::OnOption(wxCommandEvent& event) } } break; +#endif // wxUSE_COLOURDLG + case Colour_BackgroundMode: m_backgroundMode = m_backgroundMode == wxSOLID ? wxTRANSPARENT : wxSOLID; @@ -1240,6 +1382,7 @@ void MyFrame::PrepareDC(wxDC& dc) dc.SetMapMode( m_mapMode ); } +#if wxUSE_COLOURDLG wxColour MyFrame::SelectColour() { wxColour col; @@ -1253,3 +1396,4 @@ wxColour MyFrame::SelectColour() return col; } +#endif // wxUSE_COLOURDLG