projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Compile fix.
[wxWidgets.git]
/
samples
/
png
/
pngdemo.cpp
diff --git
a/samples/png/pngdemo.cpp
b/samples/png/pngdemo.cpp
index da50f96d5daa893d50e6738948bde2ee40836694..473340a6e95e51fd39794423d36c31388eb2e47d 100644
(file)
--- a/
samples/png/pngdemo.cpp
+++ b/
samples/png/pngdemo.cpp
@@
-20,10
+20,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
-#ifdef __WXMSW__
-#include <wx/pnghand.h>
-// #include <wx/xpmhand.h>
-#endif
+#include "wx/image.h"
#include "pngdemo.h"
#include "pngdemo.h"
@@
-38,11
+35,7
@@
MyApp::MyApp()
bool MyApp::OnInit(void)
{
bool MyApp::OnInit(void)
{
-#ifdef __WXMSW__
- wxBitmap::AddHandler(new wxPNGFileHandler);
-// wxBitmap::AddHandler(new wxXPMFileHandler);
-// wxBitmap::AddHandler(new wxXPMDataHandler);
-#endif
+ wxImage::AddHandler(new wxPNGHandler);
// Create the main frame window
frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));
// Create the main frame window
frame = new MyFrame((wxFrame *) NULL, "wxPNGBitmap Demo", wxPoint(0, 0), wxSize(300, 300));