apply SF patch 876817

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/svg/svgtest.cpp b/contrib/samples/svg/svgtest.cpp
index 0ab198d87cd095ecf55186a264f865f27bdf4513..56882fb67793216256ff63b625364cb8bd195190 100644 (file)
--- a/contrib/samples/svg/svgtest.cpp
+++ b/contrib/samples/svg/svgtest.cpp
@@ -39,9 +39,8 @@ USERC("svg.rc");
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 

-#ifndef __WXMSW__

 #include "mondrian.xpm"                                                                             
 #include "mondrian.xpm"                                                                             

-#endif                                                                     
+

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


@@ -253,9 +252,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("wxWindows 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"));

 }
 
 
 }
 
 


@@ -301,12 +300,13 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 }
 
 
 }
 
 

-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();

 }
 
 
 }
 
 


@@ -536,8 +536,8 @@ void MyCanvas::OnDraw(wxDC& dc)
             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);

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

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 0ab198d87cd095ecf55186a264f865f27bdf4513..56882fb67793216256ff63b625364cb8bd195190 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -39,9 +39,8 @@ USERC("svg.rc");
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 
 #include <wx/toolbar.h>
 #include <wx/svg/dcsvg.h>
 

-#ifndef __WXMSW__

 #include "mondrian.xpm"                                                                             
 #include "mondrian.xpm"                                                                             

-#endif                                                                     
+

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


@@ -253,9 +252,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("wxWindows 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"));

 }
 
 
 }
 
 


@@ -301,12 +300,13 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
 }
 
 
 }
 
 

-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();

 }
 
 
 }
 
 


@@ -536,8 +536,8 @@ void MyCanvas::OnDraw(wxDC& dc)
             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);

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