X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/49e3b82c03986663a276f6ec3374d5fd1b088484..c29c95fe24973b94fd724db767193171ca7c513d:/samples/svg/svgtest.cpp diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp index ccf21cff55..159a15cf9c 100644 --- a/samples/svg/svgtest.cpp +++ b/samples/svg/svgtest.cpp @@ -4,7 +4,7 @@ // Author: Chris Elliott // Modified by: // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // =========================================================================== @@ -31,13 +31,15 @@ #include "wx/dcsvg.h" #include "wx/vector.h" -#include "mondrian.xpm" - #include "bitmaps/new.xpm" #include "bitmaps/save.xpm" #include "bitmaps/help.xpm" #include "SVGlogo24.xpm" +#if !defined(__WXMSW__) && !defined(__WXPM__) + #include "../sample.xpm" +#endif + class MyChild; class MyCanvas; @@ -64,29 +66,29 @@ public: void OnNewWindow(wxCommandEvent& event); void OnQuit(wxCommandEvent& event); void FileSavePicture (wxCommandEvent& event); - + unsigned int GetCountOfChildren() const { return m_nWinCreated; } private: unsigned int m_nWinCreated; - + DECLARE_EVENT_TABLE() }; class MyChild: public wxMDIChildFrame { public: - MyChild(wxMDIParentFrame *parent, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + MyChild(wxMDIParentFrame *parent, const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, const long style = wxDEFAULT_FRAME_STYLE); ~MyChild(); void OnActivate(wxActivateEvent& event); void OnQuit(wxCommandEvent& event); bool OnSave(wxString filename); - + MyFrame* GetFrame() { return m_frame; } @@ -106,7 +108,7 @@ public: private: int m_index; MyChild* m_child; - + DECLARE_EVENT_TABLE() }; @@ -158,8 +160,6 @@ bool MyApp::OnInit() frame->Show(true); - SetTopWindow(frame); - return true; } @@ -175,7 +175,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, { m_nWinCreated = 0; - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); // Make a menubar wxMenu *file_menu = new wxMenu; @@ -211,7 +211,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) ) { (void)wxMessageBox(wxT("wxWidgets SVG sample\n") wxT("Author: Chris Elliott (c) 2002-2009\n") - wxT("Usage: click File|New to show tests"), + wxT("Usage: click File|New to show tests"), wxT("About SVG Test")); } @@ -222,13 +222,13 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) ) wxString title; title.Printf(wxT("SVG Test Window %d"), m_nWinCreated ); - + // counts number of children previously, even if now closed m_nWinCreated ++; // Give it a title and icon subframe->SetTitle(title); - subframe->SetIcon(wxICON(mondrian)); + subframe->SetIcon(wxICON(sample)); // Make a menubar wxMenu *file_menu = new wxMenu; @@ -318,7 +318,7 @@ END_EVENT_TABLE() MyCanvas::MyCanvas(MyChild *parent, const wxPoint& pos, const wxSize& size) : wxScrolledWindow(parent, wxID_ANY, pos, size, wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL) { - SetBackgroundColour(wxColour(_T("WHITE"))); + SetBackgroundColour(wxColour(wxT("WHITE"))); m_child = parent; m_index = m_child->GetFrame()->GetCountOfChildren() % 7; @@ -365,10 +365,10 @@ void MyCanvas::OnDraw(wxDC& dc) dc.SetBrush(*wxCYAN_BRUSH); dc.SetPen(*wxRED_PEN); dc.DrawRectangle(10, 10, 100, 70); - wB = wxBrush (_T("DARK ORCHID"), wxBRUSHSTYLE_TRANSPARENT); + wB = wxBrush (wxT("DARK ORCHID"), wxBRUSHSTYLE_TRANSPARENT); dc.SetBrush (wB); dc.DrawRoundedRectangle(50, 50, 100, 70, 20); - dc.SetBrush (wxBrush(_T("GOLDENROD")) ); + dc.SetBrush (wxBrush(wxT("GOLDENROD")) ); dc.DrawEllipse(100, 100, 100, 50); points[0].x = 100; points[0].y = 200; @@ -391,10 +391,10 @@ void MyCanvas::OnDraw(wxDC& dc) dc.DrawLine(45,30,55,30); dc.DrawText(wxT("This is a Swiss-style string"), 50, 30); wC = dc.GetTextForeground(); - dc.SetTextForeground (_T("FIREBRICK")); + dc.SetTextForeground (wxT("FIREBRICK")); // no effect in msw ?? - dc.SetTextBackground (_T("WHEAT")); + dc.SetTextBackground (wxT("WHEAT")); dc.DrawText(wxT("This is a Red string"), 50, 200); dc.DrawRotatedText(wxT("This is a 45 deg string"), 50, 200, 45); dc.DrawRotatedText(wxT("This is a 90 deg string"), 50, 200, 90); @@ -417,11 +417,11 @@ void MyCanvas::OnDraw(wxDC& dc) dc.DrawArc ( 270-50, 270-86, 270-86, 270-50, 270,270 ); dc.SetDeviceOrigin(0,0); - wP.SetColour (_T("CADET BLUE")); + wP.SetColour (wxT("CADET BLUE")); dc.SetPen(wP); dc.DrawArc ( 75,125, 110, 40, 75, 75 ); - wP.SetColour (_T("SALMON")); + wP.SetColour (wxT("SALMON")); dc.SetPen(wP); dc.SetBrush(*wxRED_BRUSH); //top left corner, width and height, start and end angle @@ -432,7 +432,7 @@ void MyCanvas::OnDraw(wxDC& dc) wP.SetWidth(3); dc.SetPen(wP); //wxTRANSPARENT)); - dc.SetBrush (wxBrush (_T("SALMON"))); + dc.SetBrush (wxBrush (wxT("SALMON"))); dc.DrawEllipticArc(300, 0,200,100, 0.0,145.0); //same end point dc.DrawEllipticArc(300, 50,200,100,90.0,145.0); @@ -445,7 +445,7 @@ void MyCanvas::OnDraw(wxDC& dc) case 4: dc.DrawCheckMark ( 30,30,25,25); - dc.SetBrush (wxBrush (_T("SALMON"),wxBRUSHSTYLE_TRANSPARENT)); + dc.SetBrush (wxBrush (wxT("SALMON"),wxBRUSHSTYLE_TRANSPARENT)); dc.DrawCheckMark ( 80,50,75,75); dc.DrawRectangle ( 80,50,75,75); #if wxUSE_STATUSBAR @@ -486,7 +486,7 @@ void MyCanvas::OnDraw(wxDC& dc) break; case 6: - dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 ); + dc.DrawIcon( wxICON(sample), 10, 10 ); dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15); #if wxUSE_STATUSBAR s = wxT("Icon and Bitmap "); @@ -517,14 +517,14 @@ MyChild::MyChild(wxMDIParentFrame *parent, const wxString& title, : wxMDIChildFrame(parent, wxID_ANY, title, pos, size, style) { m_frame = (MyFrame *) parent; - + #if wxUSE_STATUSBAR CreateStatusBar(); SetStatusText(title); #endif // wxUSE_STATUSBAR m_canvas = new MyCanvas(this, wxPoint(0, 0), GetClientSize()); - + // Give it scrollbars m_canvas->SetScrollbars(20, 20, 50, 50); }