32/64 bit universal builds support

[wxWidgets.git] / samples / svg / svgtest.cpp

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 0ab198d87cd095ecf55186a264f865f27bdf4513..2d20ab13685a26354ab5c6064350f7d34f4715b6 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -1,12 +1,3 @@
-// biol75@york.ac.uk (Chris Elliott) March 2000
-
-#ifdef __BIDE__
-#define _NO_VCL
-#include "condefs.h"
-USERC("svg.rc");
-//---------------------------------------------------------------------------
-#define WinMain WinMain
-#endif

 /////////////////////////////////////////////////////////////////////////////
 // Name:        svgtest.cpp
 // Purpose:     SVG sample
 /////////////////////////////////////////////////////////////////////////////
 // Name:        svgtest.cpp
 // Purpose:     SVG sample


@@ -36,17 +27,16 @@ USERC("svg.rc");
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"
 #endif
 

-#include <wx/toolbar.h>
-#include <wx/svg/dcsvg.h>
+#include "wx/toolbar.h"
+#include "wx/dcsvg.h"
+
+#include "mondrian.xpm"

 
 

-#ifndef __WXMSW__
-#include "mondrian.xpm"                                                                             
-#endif                                                                     

 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"
 #include "bitmaps/new.xpm"
 #include "bitmaps/save.xpm"
 #include "bitmaps/help.xpm"
 #include "SVGlogo24.xpm"

-                                                                            
+

 class MyChild;
 
 // Define a new application
 class MyChild;
 
 // Define a new application


@@ -84,7 +74,7 @@ class MyCanvas : public wxScrolledWindow
 {
     public:
         int m_index ;
 {
     public:
         int m_index ;

-   
+

         MyChild * m_child ;
         MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
         virtual void OnDraw(wxDC& dc);
         MyChild * m_child ;
         MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
         virtual void OnDraw(wxDC& dc);


@@ -161,7 +151,7 @@ bool MyApp::OnInit()
     frame = new MyFrame((wxFrame *)NULL, -1, wxT("SVG Demo"),
         wxPoint(-1, -1), wxSize(500, 400),
         wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL);
     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;
 
     // Make a menubar
     wxMenu *file_menu = new wxMenu;


@@ -180,13 +170,15 @@ bool MyApp::OnInit()
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     frame->SetMenuBar(menu_bar);
 

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar();
     frame->CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
 

-    frame->Show(TRUE);
+    frame->Show(true);

 
     SetTopWindow(frame);
 
 
     SetTopWindow(frame);
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -223,8 +215,8 @@ void MyFrame::OnClose(wxCloseEvent& event)
         return ;
     }
     // now try the children
         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 )
     {
     MyChild * pChild ;
     while ( pNode )
     {


@@ -232,7 +224,7 @@ void MyFrame::OnClose(wxCloseEvent& event)
         pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {
         pChild = (MyChild*) pNode -> GetData ();
         if (pChild -> Close ())
         {

-            delete pNode ;
+            m_children.Erase(pNode) ;

         }
         else
         {
         }
         else
         {


@@ -253,9 +245,9 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {

-    (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n"
-        "Author: Chris Elliott (c) 2002\n"
-        "Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));
+    (void)wxMessageBox(wxT("wxWidgets 2.0 SVG 1.0 Test\n")
+        wxT("Author: Chris Elliott (c) 2002\n")
+        wxT("Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test"));

 }
 
 
 }
 
 


@@ -297,16 +289,17 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 
     // Associate the menu bar with the frame
     subframe->SetMenuBar(menu_bar);
 

-    subframe->Show(TRUE);
+    subframe->Show(true);

 }
 
 
 }
 
 

-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+void MyFrame::OnSize(wxSizeEvent& event)

 {
     int w, h;
     GetClientSize(&w, &h);
 
     GetClientWindow()->SetSize(0, 0, w, h);
 {
     int w, h;
     GetClientSize(&w, &h);
 
     GetClientWindow()->SetSize(0, 0, w, h);

+    event.Skip();

 }
 
 
 }
 
 


@@ -319,15 +312,10 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
     bitmaps[1] = new wxBitmap( save_xpm );
     bitmaps[2] = new wxBitmap( help_xpm );
 
     bitmaps[1] = new wxBitmap( save_xpm );
     bitmaps[2] = new wxBitmap( help_xpm );
 

-    int width = 16;
-    int currentX = 5;
-
-    toolBar->AddTool( MDI_NEW_WINDOW, *(bitmaps[0]), wxNullBitmap, FALSE, currentX, -1, (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"));
-    currentX += width + 5;
-    toolBar->AddSeparator();      
-    toolBar->AddTool(MDI_ABOUT, *bitmaps[2], wxNullBitmap, TRUE, currentX, -1, (wxObject *) NULL, wxT("Help"));
+    toolBar->AddTool(MDI_NEW_WINDOW, wxEmptyString, *(bitmaps[0]), wxS("New SVG test window"));
+    toolBar->AddTool(MDI_SAVE, wxEmptyString, *bitmaps[1], wxS("Save test in SVG format"));
+    toolBar->AddSeparator();
+    toolBar->AddTool(MDI_ABOUT, wxEmptyString, *bitmaps[2], wxS("Help"));

 
     toolBar->Realize();
 
 
     toolBar->Realize();
 


@@ -339,15 +327,16 @@ void MyFrame::InitToolBar(wxToolBar* toolBar)
 
 void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
 {
 
 void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
 {

+#if wxUSE_FILEDLG

     MyChild * pChild = (MyChild *)GetActiveChild ();
     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"),
     {
         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)
     {
 
     if (dialog.ShowModal() == wxID_OK)
     {


@@ -357,6 +346,7 @@ void MyFrame::FileSavePicture (wxCommandEvent & WXUNUSED(event) )
         }
     }
     return ;
         }
     }
     return ;

+#endif // wxUSE_FILEDLG

 }
 
 
 }
 
 


@@ -391,7 +381,9 @@ wxSUNKEN_BORDER|wxVSCROLL|wxHSCROLL)
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...
 void MyCanvas::OnDraw(wxDC& dc)
 {
     // vars to use ...

+#if wxUSE_STATUSBAR

     wxString s ;
     wxString s ;

+#endif // wxUSE_STATUSBAR

     wxPen wP ;
     wxBrush wB ;
     wxPoint points[6];
     wxPen wP ;
     wxBrush wB ;
     wxPoint points[6];


@@ -401,7 +393,7 @@ void MyCanvas::OnDraw(wxDC& dc)
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
 
     dc.SetFont(*wxSWISS_FONT);
     dc.SetPen(*wxGREEN_PEN);
 

-    
+

     switch (m_index)
     {
         default:
     switch (m_index)
     {
         default:


@@ -417,7 +409,9 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawPoint (25,15) ;
             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);
             dc.DrawPoint (25,15) ;
             dc.DrawLine(50, 30, 200, 30);
             dc.DrawSpline(50, 200, 50, 100, 200, 10);

+#if wxUSE_STATUSBAR

             s = wxT("Green Cross, Cyan Line and spline");
             s = wxT("Green Cross, Cyan Line and spline");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 1:
             break ;
 
         case 1:


@@ -425,10 +419,10 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.SetBrush(*wxCYAN_BRUSH);
             dc.SetPen(*wxRED_PEN);
             dc.DrawRectangle(10, 10, 100, 70);
             dc.SetBrush(*wxCYAN_BRUSH);
             dc.SetPen(*wxRED_PEN);
             dc.DrawRectangle(10, 10, 100, 70);

-            wB = wxBrush (_T("DARK ORCHID"), wxTRANSPARENT);
+            wB = wxBrush (_T("DARK ORCHID"), wxBRUSHSTYLE_TRANSPARENT);

             dc.SetBrush (wB);
             dc.DrawRoundedRectangle(50, 50, 100, 70, 20);
             dc.SetBrush (wB);
             dc.DrawRoundedRectangle(50, 50, 100, 70, 20);

-            dc.SetBrush (wxBrush(_T("GOLDENROD"), wxSOLID) );
+            dc.SetBrush (wxBrush(_T("GOLDENROD")) );

             dc.DrawEllipse(100, 100, 100, 50);
 
             points[0].x = 100; points[0].y = 200;
             dc.DrawEllipse(100, 100, 100, 50);
 
             points[0].x = 100; points[0].y = 200;


@@ -440,7 +434,9 @@ void MyCanvas::OnDraw(wxDC& dc)
 
             dc.DrawPolygon(5, points);
             dc.DrawLines (6, points, 160);
 
             dc.DrawPolygon(5, points);
             dc.DrawLines (6, points, 160);

+#if wxUSE_STATUSBAR

             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");
             s = wxT("Blue rectangle, red edge, clear rounded rectangle, gold ellipse, gold and clear stars");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 2:
             break ;
 
         case 2:


@@ -450,17 +446,19 @@ void MyCanvas::OnDraw(wxDC& dc)
             dc.DrawText(wxT("This is a Swiss-style string"), 50, 30);
             wC = dc.GetTextForeground() ;
             dc.SetTextForeground (_T("FIREBRICK"));
             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);
             // 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);
             dc.SetFont(wF);
             dc.SetTextForeground (wC) ;
             dc.DrawText(wxT("This is a Times-style string"), 50, 60);

+#if wxUSE_STATUSBAR

             s = wxT("Swiss, Times text; red text, rotated and colored orange");
             s = wxT("Swiss, Times text; red text, rotated and colored orange");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 3 :
             break ;
 
         case 3 :


@@ -488,25 +486,29 @@ void MyCanvas::OnDraw(wxDC& dc)
             wP.SetWidth(3);
             dc.SetPen(wP);
                                  //wxTRANSPARENT));
             wP.SetWidth(3);
             dc.SetPen(wP);
                                  //wxTRANSPARENT));

-            dc.SetBrush (wxBrush (_T("SALMON"),wxSOLID)) ;
+            dc.SetBrush (wxBrush (_T("SALMON"))) ;

             dc.DrawEllipticArc(300,  0,200,100, 0.0,145.0) ;
                                  //same end point
             dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
             dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
 
             dc.DrawEllipticArc(300,  0,200,100, 0.0,145.0) ;
                                  //same end point
             dc.DrawEllipticArc(300, 50,200,100,90.0,145.0) ;
             dc.DrawEllipticArc(300,100,200,100,90.0,345.0) ;
 

+#if wxUSE_STATUSBAR

             s = wxT("This is an arc test page");
             s = wxT("This is an arc test page");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 4:
             dc.DrawCheckMark ( 30,30,25,25);
             break ;
 
         case 4:
             dc.DrawCheckMark ( 30,30,25,25);

-            dc.SetBrush (wxBrush (_T("SALMON"),wxTRANSPARENT));
+            dc.SetBrush (wxBrush (_T("SALMON"),wxBRUSHSTYLE_TRANSPARENT));

             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);
             dc.DrawCheckMark ( 80,50,75,75);
             dc.DrawRectangle ( 80,50,75,75);

+#if wxUSE_STATUSBAR

             s = wxT("Two check marks");
             s = wxT("Two check marks");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 5:
             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);
             dc.SetFont(wF);
             dc.DrawLine(0, 0, 200, 200);
             dc.DrawLine(200, 0, 0, 200);


@@ -531,18 +533,24 @@ 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.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");
             s = wxT("Scaling test page");

+#endif // wxUSE_STATUSBAR

             break ;
 
         case 6:
             break ;
 
         case 6:

-            dc.DrawIcon( wxICON(mondrian), 10, 10 );
-            dc.DrawBitmap ( wxBITMAP (svgbitmap), 50,15);
+            dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
+            dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
+#if wxUSE_STATUSBAR

             s = wxT("Icon and Bitmap ");
             s = wxT("Icon and Bitmap ");

+#endif // wxUSE_STATUSBAR

             break ;
 
     }
             break ;
 
     }

+#if wxUSE_STATUSBAR

     m_child->SetStatusText(s);
     m_child->SetStatusText(s);

+#endif // wxUSE_STATUSBAR

 }
 
 
 }
 
 


@@ -559,8 +567,10 @@ const long style)
 {
 
     m_frame = (MyFrame *) parent ;
 {
 
     m_frame = (MyFrame *) parent ;

+#if wxUSE_STATUSBAR

     CreateStatusBar();
     CreateStatusBar();

-    SetStatusText(title);    
+    SetStatusText(title);
+#endif // wxUSE_STATUSBAR

 
     int w, h ;
     GetClientSize ( &w, &h );
 
     int w, h ;
     GetClientSize ( &w, &h );


@@ -579,7 +589,7 @@ MyChild::~MyChild()
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyChild::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 
 }
 
 


@@ -587,7 +597,7 @@ bool MyChild::OnSave(wxString filename)
 {
     wxSVGFileDC svgDC (filename, 600, 650) ;
     m_canvas->OnDraw (svgDC);
 {
     wxSVGFileDC svgDC (filename, 600, 650) ;
     m_canvas->OnDraw (svgDC);

-    return svgDC.Ok();
+    return svgDC.IsOk();

 }
 
 
 }