Don't interpret '&' specially in wxTextWrapper.

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

diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index bd6e57aab9e968fe63639c9e0decfe818b8916fd..6d31539e291172ab5e31c164558b8f6511ef4c1c 100644 (file)
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -1,5 +1,39 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pnghand.h"
-#else
-#include "wx/mac/carbon/pnghand.h"
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/osx/pnghand.h
+// Purpose:     PNG bitmap handler
+// Author:      Julian Smart
+// Modified by:
+// Created:     04/01/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PNGHAND_H_
+#define _WX_PNGHAND_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_LIBPNG
+
+class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
+{
+  DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
+public:
+  inline wxPNGFileHandler(void)
+  {
+    SetName(wxT("PNG bitmap file"));
+    SetExtension(wxT("bmp"));
+    SetType(wxBITMAP_TYPE_PNG);
+  };
+
+  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+      int desiredWidth, int desiredHeight);
+  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+};
+
+#endif //wxUSE_LIBPNG
+
 #endif
+  // _WX_PNGHAND_H_
+