Ifdef'd out sample code for wxStaticBitmap. It's not working under

[wxWidgets.git] / samples / png / pngdemo.cpp

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 8cc344029f3118f845397b061562e6f30c59a87d..da50f96d5daa893d50e6738948bde2ee40836694 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -22,6 +22,7 @@
 
 #ifdef __WXMSW__
 #include <wx/pnghand.h>
+// #include <wx/xpmhand.h>
 #endif
 
 #include "pngdemo.h"
@@ -39,6 +40,8 @@ bool MyApp::OnInit(void)
 {
 #ifdef __WXMSW__
   wxBitmap::AddHandler(new wxPNGFileHandler);
+//  wxBitmap::AddHandler(new wxXPMFileHandler);
+//  wxBitmap::AddHandler(new wxXPMDataHandler);
 #endif
 
   // Create the main frame window
@@ -104,10 +107,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 );
   
@@ -132,10 +135,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 )
@@ -204,12 +207,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;
-}