wxMotif compiles (and runs minimal sample) again after wxMenu changes

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

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 07d19ac4a5269e4f23d5f875acf486284852136a..c3ef8185092926c22c9036d27387ff4d0dff9978 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -21,8 +21,10 @@
 #endif
 
 #ifdef __WXMSW__
-#include <wx/pnghand.h>
-// #include <wx/xpmhand.h>
+#include "wx/pnghand.h"
+#endif
+#ifdef __WXGTK__
+#include "wx/image.h"
 #endif
 
 #include "pngdemo.h"
@@ -40,8 +42,9 @@ bool MyApp::OnInit(void)
 {
 #ifdef __WXMSW__
   wxBitmap::AddHandler(new wxPNGFileHandler);
-//  wxBitmap::AddHandler(new wxXPMFileHandler);
-//  wxBitmap::AddHandler(new wxXPMDataHandler);
+#endif
+#ifdef __WXGTK__
+  wxImage::AddHandler(new wxPNGHandler);
 #endif
 
   // Create the main frame window
@@ -107,10 +110,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 +138,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 +210,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;
-}