don't try to remove -g flag from CFLAGS, it is not necessary and doesn't work correct...

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

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 520bb10fd10b2e3f7f883998647543259a42c1dc..186d3c90ac752fb56b46f8b81388c82c692307da 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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"
 


@@ -92,6 +87,16 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, cons
   canvas = (MyCanvas *) NULL;
 }
 
   canvas = (MyCanvas *) NULL;
 }
 

+// frame destructor
+MyFrame::~MyFrame()
+{
+    if (g_TestBitmap)
+    {
+        delete g_TestBitmap;
+        g_TestBitmap = (wxBitmap *) NULL;
+    }
+}
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     Close(TRUE);


@@ -105,8 +110,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;
   


@@ -132,15 +138,17 @@ void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnLoadFile(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");
+    // Show file selector.
+    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;

 
     if ( g_TestBitmap )
         delete g_TestBitmap;
 
     if ( g_TestBitmap )
         delete g_TestBitmap;

+

     g_TestBitmap = new wxBitmap(f, wxBITMAP_TYPE_PNG);
     if (!g_TestBitmap->Ok())
     {
     g_TestBitmap = new wxBitmap(f, wxBITMAP_TYPE_PNG);
     if (!g_TestBitmap->Ok())
     {