use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

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

diff --git a/include/wx/mac/carbon/pnghand.h b/include/wx/mac/carbon/pnghand.h
index 0dab2fa1a60ed37c0680089316fa2774ea8460cc..2d8b4a0b27a1b92dc3ec4a66e8a0378b98aed6dd 100644 (file)
--- a/include/wx/mac/carbon/pnghand.h
+++ b/include/wx/mac/carbon/pnghand.h
@@ -6,25 +6,25 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pnghand.h"
-#endif
-
 #ifndef _WX_PNGHAND_H_
 #define _WX_PNGHAND_H_
 
+#include "wx/defs.h"
+
+#if wxUSE_LIBPNG
+
 class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
 public:
   inline wxPNGFileHandler(void)
   {
-    m_name = wxT("PNG bitmap file");
-    m_extension = wxT("bmp");
-    m_type = wxBITMAP_TYPE_PNG;
+    SetName(wxT("PNG bitmap file"));
+    SetExtension(wxT("bmp"));
+    SetType(wxBITMAP_TYPE_PNG);
   };
 
   virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
@@ -32,6 +32,8 @@ public:
   virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 };
 
+#endif //wxUSE_LIBPNG
+
 #endif
   // _WX_PNGHAND_H_