don't treat changing focus to popup's child as loosing it

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

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 07d19ac4a5269e4f23d5f875acf486284852136a..0d88f11699226c48808d27b709e503b60085f0a7 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));


@@ -107,10 +100,11 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 {

-  char *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;
+  if (f == "")  return;

   
   wxBitmap *backstore = new wxBitmap( 150, 150 );
   
   
   wxBitmap *backstore = new wxBitmap( 150, 150 );
   


@@ -135,10 +129,11 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {
        // Show file selector.
 void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {
        // Show file selector.

-       char *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)
+       if (f == "")

          return;
 
     if ( g_TestBitmap )
          return;
 
     if ( g_TestBitmap )


@@ -207,12 +202,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;
-}