X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b11729f1496ef0bba192a00af430eb46a581e97d..1f2b90153e9580ef89095cec62a61f770cb24ef9:/samples/drawing/drawing.cpp?ds=sidebyside diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 31f673167b..31918e3f08 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -17,11 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(__APPLE__) - #pragma implementation - #pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -39,6 +34,19 @@ #include "wx/image.h" #include "wx/artprov.h" +#define wxTEST_GRAPHICS 1 + +#if wxTEST_GRAPHICS +#include "wx/graphics.h" +#if wxUSE_GRAPHICS_CONTEXT == 0 +#undef wxTEST_GRAPHICS +#define wxTEST_GRAPHICS 0 +#endif +#else +#undef wxUSE_GRAPHICS_CONTEXT +#define wxUSE_GRAPHICS_CONTEXT 0 +#endif + // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- @@ -65,7 +73,12 @@ enum ScreenToShow Show_Ops, Show_Regions, Show_Circles, - Show_Splines + Show_Splines, +#if wxUSE_GRAPHICS_CONTEXT + Show_Alpha, +#endif + Show_Gradient, + Show_Max }; // ---------------------------------------------------------------------------- @@ -117,6 +130,9 @@ public: void OnQuit(wxCommandEvent& event); void OnAbout(wxCommandEvent& event); void OnClip(wxCommandEvent& event); +#if wxUSE_GRAPHICS_CONTEXT + void OnGraphicContext(wxCommandEvent& event); +#endif void OnShow(wxCommandEvent &event); void OnOption(wxCommandEvent &event); @@ -157,6 +173,9 @@ public: // set or remove the clipping region void Clip(bool clip) { m_clip = clip; Refresh(); } +#if wxUSE_GRAPHICS_CONTEXT + void UseGraphicContext(bool use) { m_useContext = use; Refresh(); } +#endif protected: void DrawTestLines( int x, int y, int width, wxDC &dc ); @@ -165,10 +184,14 @@ protected: void DrawText(wxDC& dc); void DrawImages(wxDC& dc); void DrawWithLogicalOps(wxDC& dc); +#if wxUSE_GRAPHICS_CONTEXT + void DrawAlpha(wxDC& dc); +#endif void DrawRegions(wxDC& dc); void DrawCircles(wxDC& dc); void DrawSplines(wxDC& dc); void DrawDefault(wxDC& dc); + void DrawGradients(wxDC& dc); void DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime); @@ -179,6 +202,9 @@ private: wxBitmap m_smile_bmp; wxIcon m_std_icon; bool m_clip; +#if wxUSE_GRAPHICS_CONTEXT + bool m_useContext ; +#endif DECLARE_EVENT_TABLE() }; @@ -205,9 +231,16 @@ enum File_ShowRegions, File_ShowCircles, File_ShowSplines, - MenuShow_Last = File_ShowSplines, +#if wxUSE_GRAPHICS_CONTEXT + File_ShowAlpha, +#endif + File_ShowGradients, + MenuShow_Last = File_ShowGradients, File_Clip, +#if wxUSE_GRAPHICS_CONTEXT + File_GraphicContext, +#endif MenuOption_First, @@ -385,6 +418,9 @@ MyCanvas::MyCanvas(MyFrame *parent) m_smile_bmp = wxBitmap(smile_xpm); m_std_icon = wxArtProvider::GetIcon(wxART_INFORMATION); m_clip = false; +#if wxUSE_GRAPHICS_CONTEXT + m_useContext = false; +#endif } void MyCanvas::DrawTestBrushes(wxDC& dc) @@ -516,7 +552,7 @@ void MyCanvas::DrawDefault(wxDC& dc) // mark the origin dc.DrawCircle(0, 0, 10); -#if !wxMAC_USE_CORE_GRAPHICS +#if !defined(wxMAC_USE_CORE_GRAPHICS) || !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 @@ -858,12 +894,92 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc) } } +#if wxUSE_GRAPHICS_CONTEXT +#ifdef __WXGTK20__ +void MyCanvas::DrawAlpha(wxDC& no_dc) +#else +void MyCanvas::DrawAlpha(wxDC& dc) +#endif +{ +#ifdef __WXGTK__ + wxGCDC dc( this ); + PrepareDC( dc ); +#endif + + wxDouble margin = 20 ; + wxDouble width = 180 ; + wxDouble radius = 30 ; + + dc.SetPen( wxPen( wxColour( 128, 0, 0, 255 ),12, wxSOLID)); + dc.SetBrush( wxBrush( wxColour( 255, 0, 0, 255),wxSOLID)); + + wxRect r(margin,margin+width*0.66,width,width) ; + + dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ; + + dc.SetPen( wxPen( wxColour( 0, 0, 128, 255 ),12, wxSOLID)); + dc.SetBrush( wxBrush( wxColour( 0, 0, 255, 255),wxSOLID)); + + r.Offset( width * 0.8 , - width * 0.66 ) ; + + dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ; + + dc.SetPen( wxPen( wxColour( 128, 128, 0, 255 ),12, wxSOLID)); + dc.SetBrush( wxBrush( wxColour( 192, 192, 0, 255),wxSOLID)); + + r.Offset( width * 0.8 , width *0.5 ) ; + + dc.DrawRoundedRectangle( r.x, r.y, r.width, r.width, radius ) ; + + dc.SetPen( *wxTRANSPARENT_PEN ) ; + dc.SetBrush( wxBrush( wxColour(255,255,128,128) ) ); + dc.DrawRoundedRectangle( 0 , margin + width / 2 , width * 3 , 100 , radius) ; + + dc.SetTextForeground( wxColour(255,255,0,128) ); + dc.SetFont( wxFont( 40, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL ) ); + dc.DrawText( wxT("Hello!"), 120, 80 ); +} + +#endif + void MyCanvas::DrawCircles(wxDC& dc) { int x = 100, y = 100, r = 20; + dc.SetPen( *wxRED_PEN ); + dc.SetBrush( *wxGREEN_BRUSH ); + + 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(_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(_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); + + y += 2*r; + dc.DrawEllipticArc(x - r, y, 2*r, r, 0, 90); + dc.DrawEllipticArc(x + r, y, 2*r, r, 90, 180); + dc.DrawEllipticArc(x + 3*r, y, 2*r, r, 180, 270); + dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360); + + // same as above, just transparent brush + + dc.SetPen( *wxRED_PEN ); + dc.SetBrush( *wxTRANSPARENT_BRUSH ); + + y += 2*r; dc.DrawText(_T("Some circles"), 0, y); dc.DrawCircle(x, y, r); dc.DrawCircle(x + 2*r, y, r); @@ -886,6 +1002,7 @@ void MyCanvas::DrawCircles(wxDC& dc) dc.DrawEllipticArc(x + r, y, 2*r, r, 90, 180); dc.DrawEllipticArc(x + 3*r, y, 2*r, r, 180, 270); dc.DrawEllipticArc(x + 5*r, y, 2*r, r, 270, 360); + } void MyCanvas::DrawSplines(wxDC& dc) @@ -976,6 +1093,36 @@ void MyCanvas::DrawSplines(wxDC& dc) #endif } +void MyCanvas::DrawGradients(wxDC& dc) +{ + // LHS: linear + wxRect r(10, 10, 100, 100); + dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxRIGHT); + + r.Offset(0, 110); + dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxLEFT); + + r.Offset(0, 110); + dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxDOWN); + + r.Offset(0, 110); + dc.GradientFillLinear(r, *wxWHITE, *wxBLUE, wxUP); + + + // RHS: concentric + r = wxRect(200, 10, 100, 100); + dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE); + + r.Offset(0, 110); + dc.GradientFillConcentric(r, *wxWHITE, *wxBLUE); + + r.Offset(0, 110); + dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE, wxPoint(0, 0)); + + r.Offset(0, 110); + dc.GradientFillConcentric(r, *wxBLUE, *wxWHITE, wxPoint(100, 100)); +} + void MyCanvas::DrawRegions(wxDC& dc) { dc.DrawText(_T("You should see a red rect partly covered by a cyan one ") @@ -1033,7 +1180,15 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) { - wxPaintDC dc(this); + wxPaintDC pdc(this); + +#if wxUSE_GRAPHICS_CONTEXT + wxGCDC gdc( pdc ) ; + wxDC &dc = m_useContext ? (wxDC&) gdc : (wxDC&) pdc ; +#else + wxDC &dc = pdc ; +#endif + PrepareDC(dc); m_owner->PrepareDC(dc); @@ -1110,6 +1265,19 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) case Show_Ops: DrawWithLogicalOps(dc); break; + +#if wxUSE_GRAPHICS_CONTEXT + case Show_Alpha: + DrawAlpha(dc); + break; +#endif + + case Show_Gradient: + DrawGradients(dc); + break; + + default: + break; } } @@ -1142,6 +1310,9 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU (File_Quit, MyFrame::OnQuit) EVT_MENU (File_About, MyFrame::OnAbout) EVT_MENU (File_Clip, MyFrame::OnClip) +#if wxUSE_GRAPHICS_CONTEXT + EVT_MENU (File_GraphicContext, MyFrame::OnGraphicContext) +#endif EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow) @@ -1166,9 +1337,16 @@ 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")); +#if wxUSE_GRAPHICS_CONTEXT + menuFile->Append(File_ShowAlpha, _T("&Alpha screen\tF10")); +#endif + menuFile->Append(File_ShowSplines, _T("&Splines screen\tF11")); + menuFile->Append(File_ShowGradients, _T("&Gradients screen\tF12")); menuFile->AppendSeparator(); menuFile->AppendCheckItem(File_Clip, _T("&Clip\tCtrl-C"), _T("Clip/unclip drawing")); +#if wxUSE_GRAPHICS_CONTEXT + menuFile->AppendCheckItem(File_GraphicContext, _T("&Use GraphicContext\tCtrl-Y"), _T("Use GraphicContext")); +#endif menuFile->AppendSeparator(); menuFile->Append(File_About, _T("&About...\tCtrl-A"), _T("Show about dialog")); menuFile->AppendSeparator(); @@ -1269,6 +1447,13 @@ void MyFrame::OnClip(wxCommandEvent& event) m_canvas->Clip(event.IsChecked()); } +#if wxUSE_GRAPHICS_CONTEXT +void MyFrame::OnGraphicContext(wxCommandEvent& event) +{ + m_canvas->UseGraphicContext(event.IsChecked()); +} +#endif + void MyFrame::OnShow(wxCommandEvent& event) { m_canvas->ToShow((ScreenToShow)(event.GetId() - MenuShow_First));