X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2fd284a4a09793c29078296529d3e9db5acd0a0f..2dace059ee7aefeea0f2b843f1808b117f112795:/samples/png/pngdemo.cpp diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp index 07d19ac4a5..473340a6e9 100644 --- a/samples/png/pngdemo.cpp +++ b/samples/png/pngdemo.cpp @@ -20,10 +20,7 @@ #pragma hdrstop #endif -#ifdef __WXMSW__ -#include <wx/pnghand.h> -// #include <wx/xpmhand.h> -#endif +#include "wx/image.h" #include "pngdemo.h" @@ -38,11 +35,7 @@ MyApp::MyApp() 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)); @@ -107,10 +100,10 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) { - char *f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL, + wxString f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL, "png", "PNG files (*.png)|*.png" ); - if (!f) return; + if (f == "") return; wxBitmap *backstore = new wxBitmap( 150, 150 ); @@ -135,10 +128,10 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event)) { // Show file selector. - char *f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png", + wxString f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png", "PNG files (*.png)|*.png"); - if (!f) + if (f == "") return; if ( g_TestBitmap ) @@ -207,12 +200,4 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) } } -// Define the behaviour for the frame closing -// - must delete all frames except for the main one. -bool MyFrame::OnClose(void) -{ - Show(FALSE); - - return TRUE; -}