synthetize 'button up' event before doubleclick, too

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

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index c3ef8185092926c22c9036d27387ff4d0dff9978..0d88f11699226c48808d27b709e503b60085f0a7 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -20,12 +20,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#ifdef __WXMSW__
-#include "wx/pnghand.h"
-#endif
-#ifdef __WXGTK__

 #include "wx/image.h"
 #include "wx/image.h"

-#endif

 
 #include "pngdemo.h"
 
 
 #include "pngdemo.h"
 


@@ -40,12 +35,7 @@ MyApp::MyApp()
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-#ifdef __WXMSW__
-  wxBitmap::AddHandler(new wxPNGFileHandler);
-#endif
-#ifdef __WXGTK__

   wxImage::AddHandler(new wxPNGHandler);
   wxImage::AddHandler(new wxPNGHandler);

-#endif

 
   // 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));


@@ -110,8 +100,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSaveFile(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;
   
 
   if (f == "")  return;
   


@@ -138,8 +129,9 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {
        // Show file selector.
 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;
 
        if (f == "")
          return;