don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index 5fd3ebe509ec00cf38e99aad136b552e7c28c7d5..1bd8f1c7f1c8ee300a0f42286f01ea957d425100 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -21,7 +21,7 @@ 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,15 +30,20 @@ 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
 };