Restore compilation with --enable-stl, fix SetFocus with the generic control, and...

[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 7f504457d9c4ab447ce4f4aea0b697e9dfabd999..2d8b4a0b27a1b92dc3ec4a66e8a0378b98aed6dd 100644 (file)
--- a/include/wx/mac/carbon/pnghand.h
+++ b/include/wx/mac/carbon/pnghand.h
@@ -12,13 +12,9 @@
 #ifndef _WX_PNGHAND_H_
 #define _WX_PNGHAND_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "pnghand.h"
-#endif
-
 #include "wx/defs.h"
 
-#if wxUSE_PNGLIB
+#if wxUSE_LIBPNG
 
 class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
 {
@@ -26,9 +22,9 @@ class WXDLLEXPORT wxPNGFileHandler: public wxBitmapHandler
 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,