Test using wxString::ToCDouble() in wxAny.

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index e6e5b30d35524010d21da6d1594fd810f60ff900..db2f2ef15b55ba3ec6b6ee7e6e9a0d9423aa061f 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$


@@ -14,14 +14,14 @@
 
 #if wxUSE_IMAGE && wxUSE_XPM
 
 
 #if wxUSE_IMAGE && wxUSE_XPM
 

-class WXDLLIMPEXP_CORE wxImage;
-class WXDLLIMPEXP_BASE 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.


@@ -30,19 +30,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):
     wxImage ReadData(const char* const* xpm_data);
     // Read directly from XPM data (as passed to wxBitmap ctor):
     wxImage ReadData(const char* const* xpm_data);

+

 #ifdef __BORLANDC__
     // needed for Borland 5.5
 #ifdef __BORLANDC__
     // needed for Borland 5.5

-    wxImage ReadData(char** xpm_data) { return ReadData(wx_const_cast(const char* const*, xpm_data)); }
+    wxImage ReadData(char** xpm_data)
+        { return ReadData(const_cast<const char* const*>(xpm_data)); }

 #endif
 };
 
 #endif // wxUSE_IMAGE && wxUSE_XPM
 
 #endif  // _WX_XPM_H_
 #endif
 };
 
 #endif // wxUSE_IMAGE && wxUSE_XPM
 
 #endif  // _WX_XPM_H_

-