Fix some compilation and linking errors in samples.

[wxWidgets.git] / include / wx / mac / pnghand.h

diff --git a/include/wx/mac/pnghand.h b/include/wx/mac/pnghand.h
index 5b43b70d5d051790e837f22d88f98a6ba7774eab..e75688c75e0b96185ecb162c3de16befe437a3f7 100644 (file)
--- a/include/wx/mac/pnghand.h
+++ b/include/wx/mac/pnghand.h
@@ -5,11 +5,11 @@
 // Modified by: 
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by: 
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Microsoft, Julian Smart
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "pnghand.h"
 #endif
 
 #pragma interface "pnghand.h"
 #endif
 


@@ -22,14 +22,14 @@ class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
 public:
   inline wxPNGFileHandler(void)
   {
 public:
   inline wxPNGFileHandler(void)
   {

-       m_name = "PNG bitmap file";
-       m_extension = "bmp";
-       m_type = wxBITMAP_TYPE_PNG;
+    m_name = wxT("PNG bitmap file");
+    m_extension = wxT("bmp");
+    m_type = wxBITMAP_TYPE_PNG;

   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
       int desiredWidth, int desiredHeight);

-  virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);

 };
 
 #endif
 };
 
 #endif