X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e22fa4d7b2608c333d8ffdb9807973b6967a2087..34326da778583ca8eab95f2e41738da2852a5a16:/samples/drawing/drawing.cpp diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp index 80437e10b4..308ea82388 100644 --- a/samples/drawing/drawing.cpp +++ b/samples/drawing/drawing.cpp @@ -37,6 +37,7 @@ #include "wx/overlay.h" #include "wx/graphics.h" #include "wx/filename.h" +#include "wx/metafile.h" #define TEST_CAIRO_EVERYWHERE 0 @@ -45,7 +46,7 @@ // ---------------------------------------------------------------------------- // the application icon -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -101,6 +102,8 @@ public: #if wxUSE_GRAPHICS_CONTEXT void OnGraphicContext(wxCommandEvent& event); #endif + void OnCopy(wxCommandEvent& event); + void OnSave(wxCommandEvent& event); void OnShow(wxCommandEvent &event); void OnOption(wxCommandEvent &event); @@ -146,6 +149,7 @@ public: #if wxUSE_GRAPHICS_CONTEXT void UseGraphicContext(bool use) { m_useContext = use; Refresh(); } #endif + void Draw(wxDC& dc); protected: enum DrawMode @@ -224,6 +228,8 @@ enum #if wxUSE_GRAPHICS_CONTEXT File_GraphicContext, #endif + File_Copy, + File_Save, MenuOption_First, @@ -347,9 +353,8 @@ bool MyApp::OnInit() MyFrame *frame = new MyFrame(wxT("Drawing sample"), wxDefaultPosition, wxSize(550, 840)); - // Show it and tell the application that it's our main window + // Show it frame->Show(true); - SetTopWindow(frame); if ( !LoadImages() ) { @@ -360,6 +365,9 @@ bool MyApp::OnInit() // still continue, the sample can be used without images too if they're // missing for whatever reason } +#if wxUSE_LIBPNG + wxImage::AddHandler( new wxPNGHandler ); +#endif return true; } @@ -420,7 +428,22 @@ void MyCanvas::DrawTestBrushes(wxDC& dc) y += HEIGHT; dc.SetBrush(wxBrush(*wxRED, wxCROSSDIAG_HATCH)); dc.DrawRectangle(x, y, WIDTH, HEIGHT); - dc.DrawText(wxT("Hatched red"), x + 10, y + 10); + dc.DrawText(wxT("Diagonally hatched red"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*wxBLUE, wxCROSS_HATCH)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(wxT("Cross hatched blue"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*wxCYAN, wxVERTICAL_HATCH)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(wxT("Vertically hatched cyan"), x + 10, y + 10); + + y += HEIGHT; + dc.SetBrush(wxBrush(*wxBLACK, wxHORIZONTAL_HATCH)); + dc.DrawRectangle(x, y, WIDTH, HEIGHT); + dc.DrawText(wxT("Horizontally hatched black"), x + 10, y + 10); y += HEIGHT; dc.SetBrush(wxBrush(*gs_bmpMask)); @@ -531,19 +554,29 @@ void MyCanvas::DrawTestLines( int x, int y, int width, wxDC &dc ) void MyCanvas::DrawDefault(wxDC& dc) { - // mark the origin - dc.DrawCircle(0, 0, 10); - -#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 - dc.SetBrush(wxBrush(wxColour(128,128,0), wxSOLID)); - - wxColour tmpColour ; - dc.GetPixel(1,1, &tmpColour); - dc.FloodFill(1,1, tmpColour, wxFLOOD_SURFACE); -#endif + // Draw circle centered at the origin, then flood fill it with a different + // color. Done with a wxMemoryDC because Blit (used by generic + // wxDoFloodFill) from a window that is being painted gives unpredictable + // results on wxGTK + { + wxImage img(21, 21, false); + img.Clear(1); + wxBitmap bmp(img); + { + wxMemoryDC mdc(bmp); + mdc.SetBrush(dc.GetBrush()); + mdc.SetPen(dc.GetPen()); + mdc.DrawCircle(10, 10, 10); + wxColour c; + if (mdc.GetPixel(11, 11, &c)) + { + mdc.SetBrush(wxColour(128, 128, 0)); + mdc.FloodFill(11, 11, c, wxFLOOD_SURFACE); + } + } + bmp.SetMask(new wxMask(bmp, wxColour(1, 1, 1))); + dc.DrawBitmap(bmp, -10, -10, true); + } dc.DrawCheckMark(5, 80, 15, 15); dc.DrawCheckMark(25, 80, 30, 30); @@ -566,7 +599,7 @@ void MyCanvas::DrawDefault(wxDC& dc) // rectangle above) //dc.SetBrush( *wxTRANSPARENT_BRUSH ); - if (m_smile_bmp.Ok()) + if (m_smile_bmp.IsOk()) dc.DrawBitmap(m_smile_bmp, x + rectSize - 20, rectSize - 10, true); dc.SetBrush( *wxBLACK_BRUSH ); @@ -789,6 +822,9 @@ void MyCanvas::DrawText(wxDC& dc) y += height; dc.DrawRectangle( 110, y, 100, height ); dc.DrawText( wxT("Another visible text"), 110, y ); + + y += height; + dc.DrawText("And\nmore\ntext on\nmultiple\nlines", 110, y); } static const struct @@ -1451,7 +1487,7 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) dc.SetBrush( *wxGREY_BRUSH ); dc.DrawRectangle( x, y, 310, 310 ); - if (m_smile_bmp.Ok()) + if (m_smile_bmp.IsOk()) { dc.DrawBitmap( m_smile_bmp, x + 150, y + 150, true ); dc.DrawBitmap( m_smile_bmp, x + 130, y + 10, true ); @@ -1461,21 +1497,47 @@ void MyCanvas::DrawRegionsHelper(wxDC& dc, wxCoord x, bool firstTime) } } -#if TEST_CAIRO_EVERYWHERE -extern wxGraphicsRenderer* gCairoRenderer; -#endif - void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) { wxPaintDC pdc(this); + Draw(pdc); +} +void MyCanvas::Draw(wxDC& pdc) +{ #if wxUSE_GRAPHICS_CONTEXT -#if TEST_CAIRO_EVERYWHERE wxGCDC gdc; - gdc.SetGraphicsContext( gCairoRenderer->CreateContext( pdc ) ); + wxGraphicsRenderer* const renderer = wxGraphicsRenderer:: +#if TEST_CAIRO_EVERYWHERE + GetCairoRenderer() #else - wxGCDC gdc( pdc ) ; + GetDefaultRenderer() +#endif + ; + + wxGraphicsContext* context; + if ( wxPaintDC *paintdc = wxDynamicCast(&pdc, wxPaintDC) ) + { + context = renderer->CreateContext(*paintdc); + } + else if ( wxMemoryDC *memdc = wxDynamicCast(&pdc, wxMemoryDC) ) + { + context = renderer->CreateContext(*memdc); + } +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + else if ( wxMetafileDC *metadc = wxDynamicCast(&pdc, wxMetafileDC) ) + { + context = renderer->CreateContext(*metadc); + } #endif + else + { + wxFAIL_MSG( "Unknown wxDC kind" ); + return; + } + + gdc.SetGraphicsContext(context); + wxDC &dc = m_useContext ? (wxDC&) gdc : (wxDC&) pdc ; #else wxDC &dc = pdc ; @@ -1486,15 +1548,15 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event)) m_owner->PrepareDC(dc); dc.SetBackgroundMode( m_owner->m_backgroundMode ); - if ( m_owner->m_backgroundBrush.Ok() ) + if ( m_owner->m_backgroundBrush.IsOk() ) dc.SetBackground( m_owner->m_backgroundBrush ); - if ( m_owner->m_colourForeground.Ok() ) + if ( m_owner->m_colourForeground.IsOk() ) dc.SetTextForeground( m_owner->m_colourForeground ); - if ( m_owner->m_colourBackground.Ok() ) + if ( m_owner->m_colourBackground.IsOk() ) dc.SetTextBackground( m_owner->m_colourBackground ); if ( m_owner->m_textureBackground) { - if ( ! m_owner->m_backgroundBrush.Ok() ) { + if ( ! m_owner->m_backgroundBrush.IsOk() ) { wxColour clr(0,128,0); wxBrush b(clr, wxSOLID); dc.SetBackground(b); @@ -1648,15 +1710,15 @@ void MyCanvas::OnMouseUp(wxMouseEvent &event) m_overlay.Reset(); m_rubberBand = false; - int x,y,xx,yy ; - event.GetPosition(&x,&y); - CalcUnscrolledPosition( x, y, &xx, &yy ); - - wxString str; - str.Printf( wxT("Rectangle selection from %d,%d to %d,%d"), - m_anchorpoint.x, m_anchorpoint.y , (int)xx, (int)yy ); - wxMessageBox( str , wxT("Rubber-Banding") ); + wxPoint endpoint = CalcUnscrolledPosition(event.GetPosition()); + // Don't pop up the message box if nothing was actually selected. + if ( endpoint != m_anchorpoint ) + { + wxLogMessage("Selected rectangle from (%d, %d) to (%d, %d)", + m_anchorpoint.x, m_anchorpoint.y, + endpoint.x, endpoint.y); + } } } @@ -1674,6 +1736,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) #if wxUSE_GRAPHICS_CONTEXT EVT_MENU (File_GraphicContext, MyFrame::OnGraphicContext) #endif + EVT_MENU (File_Copy, MyFrame::OnCopy) + EVT_MENU (File_Save, MyFrame::OnSave) EVT_MENU_RANGE(MenuShow_First, MenuShow_Last, MyFrame::OnShow) @@ -1702,7 +1766,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_GRAPHICS_CONTEXT menuFile->Append(File_ShowAlpha, wxT("&Alpha screen\tF10")); #endif - menuFile->Append(File_ShowSplines, wxT("&Splines screen\tF11")); + menuFile->Append(File_ShowSplines, wxT("Spl&ines screen\tF11")); menuFile->Append(File_ShowGradients, wxT("&Gradients screen\tF12")); #if wxUSE_GRAPHICS_CONTEXT menuFile->Append(File_ShowGraphics, wxT("&Graphics screen")); @@ -1713,7 +1777,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) menuFile->AppendCheckItem(File_GraphicContext, wxT("&Use GraphicContext\tCtrl-Y"), wxT("Use GraphicContext")); #endif menuFile->AppendSeparator(); - menuFile->Append(File_About, wxT("&About...\tCtrl-A"), wxT("Show about dialog")); +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + menuFile->Append(File_Copy, wxT("Copy to clipboard")); +#endif + menuFile->Append(File_Save, wxT("&Save...\tCtrl-S"), wxT("Save drawing to file")); + menuFile->AppendSeparator(); + menuFile->Append(File_About, wxT("&About\tCtrl-A"), wxT("Show about dialog")); menuFile->AppendSeparator(); menuFile->Append(File_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); @@ -1819,6 +1888,38 @@ void MyFrame::OnGraphicContext(wxCommandEvent& event) } #endif +void MyFrame::OnCopy(wxCommandEvent& WXUNUSED(event)) +{ +#if wxUSE_METAFILE && defined(wxMETAFILE_IS_ENH) + wxMetafileDC dc; + if (!dc.IsOk()) + return; + m_canvas->Draw(dc); + wxMetafile *mf = dc.Close(); + if (!mf) + return; + mf->SetClipboard(); + delete mf; +#endif +} + +void MyFrame::OnSave(wxCommandEvent& WXUNUSED(event)) +{ + wxFileDialog dlg(this, wxT("Save as bitmap"), wxT(""), wxT(""), +#if wxUSE_LIBPNG + wxT("PNG image (*.png)|*.png;*.PNG|") +#endif + wxT("Bitmap image (*.bmp)|*.bmp;*.BMP"), + wxFD_SAVE | wxFD_OVERWRITE_PROMPT); + if (dlg.ShowModal() == wxID_OK) + { + wxBitmap bmp(500, 800); + wxMemoryDC mdc(bmp); + m_canvas->Draw(mdc); + bmp.ConvertToImage().SaveFile(dlg.GetPath()); + } +} + void MyFrame::OnShow(wxCommandEvent& event) { m_canvas->ToShow(event.GetId()); @@ -1899,7 +2000,7 @@ void MyFrame::OnOption(wxCommandEvent& event) case Colour_Background: { wxColour col = SelectColour(); - if ( col.Ok() ) + if ( col.IsOk() ) { m_backgroundBrush.SetColour(col); }