include <string>

[wxWidgets.git] / include / wx / xpmdecod.h

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 13c1e86b9ee608cad8b786f7bcdd86a070ceaf44..82b80fa3d7aee487e91be22bda0f628c02d12470 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xpmdecod.h
+// Name:        wx/xpmdecod.h

 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$
 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$


@@ -10,22 +10,18 @@
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 
 #ifndef _WX_XPMDECOD_H_
 #define _WX_XPMDECOD_H_
 

-#ifdef __GNUG__
-#pragma interface "xpmdecod.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"

 
 #if wxUSE_IMAGE && wxUSE_XPM
 
 
 #if wxUSE_IMAGE && wxUSE_XPM
 

-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxInputStream;
+class WXDLLIMPEXP_FWD_CORE wxImage;
+class WXDLLIMPEXP_FWD_BASE wxInputStream;

 
 // --------------------------------------------------------------------------
 // wxXPMDecoder class
 // --------------------------------------------------------------------------
 
 
 // --------------------------------------------------------------------------
 // wxXPMDecoder class
 // --------------------------------------------------------------------------
 

-class WXDLLEXPORT wxXPMDecoder
+class WXDLLIMPEXP_CORE wxXPMDecoder

 {
 public:
     // constructor, destructor, etc.
 {
 public:
     // constructor, destructor, etc.


@@ -39,10 +35,13 @@ public:
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read directly from XPM data (as passed to wxBitmap ctor):

-    wxImage ReadData(const char **xpm_data);
+    wxImage ReadData(const char* const* xpm_data);
+#ifdef __BORLANDC__
+    // needed for Borland 5.5
+    wxImage ReadData(char** xpm_data) { return ReadData(wx_const_cast(const char* const*, xpm_data)); }
+#endif

 };
 
 };
 

+#endif // wxUSE_IMAGE && wxUSE_XPM

 
 

-#endif  // wxUSE_IMAGE && wxUSE_XPM
-#endif  // _WX_GIFDECOD_H_
-
+#endif  // _WX_XPM_H_