Fix wxOSX warnings about int-to-void* casts.

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 13c1e86b9ee608cad8b786f7bcdd86a070ceaf44..68edc924e7c07d0d9ebd5c17cc8fb0966dd4f5a1 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -1,8 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik

-// CVS-ID:      $Id$

 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2001 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -10,22 +9,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.


@@ -34,15 +29,23 @@ public:
 
 #if wxUSE_STREAMS
     // Is the stream XPM file?
 
 #if wxUSE_STREAMS
     // Is the stream XPM file?

+    // NOTE: this function modifies the current stream position

     bool CanRead(wxInputStream& stream);
     bool CanRead(wxInputStream& stream);

+

     // Read XPM file from the stream, parse it and create image from it
     wxImage ReadFile(wxInputStream& stream);
 #endif
     // Read XPM file from the stream, parse it and create image from it
     wxImage ReadFile(wxInputStream& stream);
 #endif

+

     // Read directly from XPM data (as passed to wxBitmap ctor):
     // 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(const_cast<const char* const*>(xpm_data)); }
+#endif
+};

 
 

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

 
 

+#endif  // _WX_XPM_H_