X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cbe51d09405849cc89b185b90aaa8880365e3dd..92209a39661334baa1552f50cdbf9698053c34de:/samples/png/pngdemo.cpp diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp index 520bb10fd1..0d88f11699 100644 --- a/samples/png/pngdemo.cpp +++ b/samples/png/pngdemo.cpp @@ -20,12 +20,7 @@ #pragma hdrstop #endif -#ifdef __WXMSW__ -#include "wx/pnghand.h" -#endif -#ifdef __WXGTK__ #include "wx/image.h" -#endif #include "pngdemo.h" @@ -105,8 +100,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) { - wxString f = wxFileSelector( "Save Image", (const char *)NULL, (const char *)NULL, - "png", "PNG files (*.png)|*.png" ); + wxString f = wxFileSelector( wxT("Save Image"), (const wxChar *)NULL, + (const wxChar *)NULL, + wxT("png"), wxT("PNG files (*.png)|*.png") ); if (f == "") return; @@ -133,8 +129,9 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event)) { // Show file selector. - wxString f = wxFileSelector("Open Image", (const char *) NULL, (const char *) NULL,"png", - "PNG files (*.png)|*.png"); + wxString f = wxFileSelector(wxT("Open Image"), (const wxChar *) NULL, + (const wxChar *) NULL, wxT("png"), + wxT("PNG files (*.png)|*.png")); if (f == "") return;