X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d96cdd4a885886d1c76c6f4cb1a7eefba34b3d10..1dbcdf2d24c896eb1b4028877964146bf1703c49:/samples/svg/svgtest.cpp

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index a20c1562d7..a353b440ce 100644
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -36,16 +36,16 @@ USERC("svg.rc");
 #include "wx/mdi.h"
 #endif
 
-#include <wx/toolbar.h>
-#include <wx/svg/dcsvg.h>
+#include "wx/toolbar.h"
+#include "wx/svg/dcsvg.h"
 
-#include "mondrian.xpm"									     
+#include "mondrian.xpm"
 
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
-									     
+
 class MyChild;
 
 // Define a new application
@@ -83,7 +83,7 @@ class MyCanvas : public wxScrolledWindow
 {
     public:
         int m_index ;
-   
+
         MyChild * m_child ;
         MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
         virtual void OnDraw(wxDC& dc);
@@ -160,7 +160,7 @@ bool MyApp::OnInit()
     frame = new MyFrame((wxFrame *)NULL, -1, wxT("SVG Demo"),
         wxPoint(-1, -1), wxSize(500, 400),
         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
-        
+
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;
@@ -187,7 +187,7 @@ bool MyApp::OnInit()
 
     SetTopWindow(frame);
 
-    return TRUE;
+    return true;
 }
 
 
@@ -224,8 +224,8 @@ void MyFrame::OnClose(wxCloseEvent& event)
         return ;
     }
     // now try the children
-    wxNode * pNode = m_children.GetFirst ();
-    wxNode * pNext ;
+    wxObjectList::compatibility_iterator pNode = m_children.GetFirst ();
+    wxObjectList::compatibility_iterator pNext ;
     MyChild * pChild ;
     while ( pNode )
     {
@@ -233,7 +233,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
         pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {
-            delete pNode ;
+            m_children.Erase(pNode) ;
         }
         else
         {
@@ -298,7 +298,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
-    subframe->Show(TRUE);
+    subframe->Show(true);
 }
 
 
@@ -324,12 +324,12 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     int width = 16;
     int currentX = 5;
 
-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("New SVG test window"));
+    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("New SVG test window"));
     currentX += width + 5;
-    toolBar->AddTool( MDI_SAVE, *bitmaps[1], wxNullBitmap, FALSE, currentX, -1, (wxObject *) NULL, wxT("Save test in SVG format"));
+    toolBar->AddTool( MDI_SAVE, *bitmaps[1], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("Save test in SVG format"));
     currentX += width + 5;
-    toolBar->AddSeparator();      
-    toolBar->AddTool(MDI_ABOUT, *bitmaps[2], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Help"));
+    toolBar->AddSeparator();
+    toolBar->AddTool(MDI_ABOUT, *bitmaps[2], wxNullBitmap, false, currentX, wxDefaultCoord, (wxObject *) NULL, wxT("Help"));
 
     toolBar->Realize();
 
@@ -341,15 +341,16 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 
 void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
 {
+#if wxUSE_FILEDLG
     MyChild * pChild = (MyChild *)GetActiveChild ();
-    if (pChild == NULL) 
+    if (pChild == NULL)
     {
         return ;
     }
 
     wxFileDialog dialog(this, wxT("Save Picture as"), wxEmptyString, pChild->GetTitle(),
         wxT("SVG vector picture files (*.svg)|*.svg"),
-        wxSAVE|wxOVERWRITE_PROMPT);
+        wxFD_SAVE|wxFD_OVERWRITE_PROMPT);
 
     if (dialog.ShowModal() == wxID_OK)
     {
@@ -359,6 +360,7 @@ void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
         }
     }
     return ;
+#endif // wxUSE_FILEDLG
 }
 
 
@@ -405,7 +407,7 @@ void MyCanvas::OnDraw(wxDC& dc)
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
 
-    
+
     switch (m_index)
     {
         default:
@@ -458,13 +460,13 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawText(wxT("This is a Swiss-style string"), 50, 30);
             wC = dc.GetTextForeground() ;
             dc.SetTextForeground (_T("FIREBRICK"));
-                                 
+
             // no effect in msw ??
             dc.SetTextBackground (_T("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);
-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, FALSE, wxT("Times New Roman"));
+            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));
             dc.SetFont(wF);
             dc.SetTextForeground (wC) ;
             dc.DrawText(wxT("This is a Times-style string"), 50, 60);
@@ -520,7 +522,7 @@ void MyCanvas::OnDraw(wxDC& dc)
             break ;
 
         case 5:
-            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, FALSE, wxT("Times New Roman"));
+            wF = wxFont ( 18, wxROMAN, wxITALIC, wxBOLD, false, wxT("Times New Roman"));
             dc.SetFont(wF);
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
@@ -545,7 +547,7 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetMapMode (wxMM_METRIC) ; //svg ignores this
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);
-            dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60); 
+            dc.DrawText(wxT("This is an 18pt string in MapMode"), 50, 60);
 #if wxUSE_STATUSBAR
             s = wxT("Scaling test page");
 #endif // wxUSE_STATUSBAR
@@ -581,7 +583,7 @@ const long style)
     m_frame = (MyFrame *) parent ;
 #if wxUSE_STATUSBAR
     CreateStatusBar();
-    SetStatusText(title);    
+    SetStatusText(title);
 #endif // wxUSE_STATUSBAR
 
     int w, h ;
@@ -601,7 +603,7 @@ MyChild::~MyChild()
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }