Applied patch [ 1166587 ] [wxMSW] Removes all flicker from wxStaticBox

[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..d58a996308f9b709c06cb3fc124e97bb79c69a14 100644 (file)
--- a/include/wx/mac/carbon/pnghand.h
+++ b/include/wx/mac/carbon/pnghand.h
@@ -6,15 +6,19 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_PNGHAND_H_
+#define _WX_PNGHAND_H_
+
 #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
 {
@@ -22,9 +26,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,
@@ -32,6 +36,8 @@ public:
   virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
 };
 
+#endif //wxUSE_LIBPNG
+
 #endif
   // _WX_PNGHAND_H_