Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apply SF patch 876817

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2004-01-14 15:28:37 +00:00
parent 2109485b37
commit 756d3e7fb5
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/samples/svg/svgtest.cpp
View File

@@ -39,9 +39,8 @@ USERC("svg.rc");
#include <wx/toolbar.h> #include <wx/toolbar.h>
#include <wx/svg/dcsvg.h> #include <wx/svg/dcsvg.h>
#ifndef __WXMSW__
#include "mondrian.xpm" #include "mondrian.xpm"
#endif
#include "bitmaps/new.xpm" #include "bitmaps/new.xpm"
#include "bitmaps/save.xpm" #include "bitmaps/save.xpm"
#include "bitmaps/help.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" (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n")
"Author: Chris Elliott (c) 2002\n" wxT("Author: Chris Elliott (c) 2002\n")
"Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test")); 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; int w, h;
GetClientSize(&w, &h); GetClientSize(&w, &h);
GetClientWindow()->SetSize(0, 0, w, h); GetClientWindow()->SetSize(0, 0, w, h);
event.Skip();
} }
@@ -536,8 +536,8 @@ void MyCanvas::OnDraw(wxDC& dc)
break ; break ;
case 6: case 6:
dc.DrawIcon( wxICON(mondrian), 10, 10 ); dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
dc.DrawBitmap ( wxBITMAP (svgbitmap), 50,15); dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
s = wxT("Icon and Bitmap "); s = wxT("Icon and Bitmap ");
break ; break ;

16
samples/svg/svgtest.cpp
View File

@@ -39,9 +39,8 @@ USERC("svg.rc");
#include <wx/toolbar.h> #include <wx/toolbar.h>
#include <wx/svg/dcsvg.h> #include <wx/svg/dcsvg.h>
#ifndef __WXMSW__
#include "mondrian.xpm" #include "mondrian.xpm"
#endif
#include "bitmaps/new.xpm" #include "bitmaps/new.xpm"
#include "bitmaps/save.xpm" #include "bitmaps/save.xpm"
#include "bitmaps/help.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" (void)wxMessageBox(wxT("wxWindows 2.0 SVG 1.0 Test\n")
"Author: Chris Elliott (c) 2002\n" wxT("Author: Chris Elliott (c) 2002\n")
"Usage: svg.exe \nClick File | New to show tests\n\n"), wxT("About SVG Test")); 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; int w, h;
GetClientSize(&w, &h); GetClientSize(&w, &h);
GetClientWindow()->SetSize(0, 0, w, h); GetClientWindow()->SetSize(0, 0, w, h);
event.Skip();
} }
@@ -536,8 +536,8 @@ void MyCanvas::OnDraw(wxDC& dc)
break ; break ;
case 6: case 6:
dc.DrawIcon( wxICON(mondrian), 10, 10 ); dc.DrawIcon( wxIcon(mondrian_xpm), 10, 10 );
dc.DrawBitmap ( wxBITMAP (svgbitmap), 50,15); dc.DrawBitmap ( wxBitmap(svgbitmap_xpm), 50,15);
s = wxT("Icon and Bitmap "); s = wxT("Icon and Bitmap ");
break ; break ;