projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added DoGetClientBestSize() and use it for a couple of controls in wxMSW.
[wxWidgets.git]
/
include
/
wx
/
xpmdecod.h
diff --git
a/include/wx/xpmdecod.h
b/include/wx/xpmdecod.h
index 99c9895eb5c7e985514f01e5d4b304bfe0900eec..1bd8f1c7f1c8ee300a0f42286f01ea957d425100 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,21
+10,18
@@
#ifndef _WX_XPMDECOD_H_
#define _WX_XPMDECOD_H_
#ifndef _WX_XPMDECOD_H_
#define _WX_XPMDECOD_H_
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "xpmdecod.h"
-#endif
-
-#include "wx/setup.h"
+#include "wx/defs.h"
+#if wxUSE_IMAGE && wxUSE_XPM
-class WXDLL
EXPORT
wxImage;
-class WXDLL
EXPORT
wxInputStream;
+class WXDLL
IMPEXP_FWD_CORE
wxImage;
+class WXDLL
IMPEXP_FWD_BASE
wxInputStream;
// --------------------------------------------------------------------------
// wxXPMDecoder class
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
// wxXPMDecoder class
// --------------------------------------------------------------------------
-class WXDLL
EXPORT
wxXPMDecoder
+class WXDLL
IMPEXP_CORE
wxXPMDecoder
{
public:
// constructor, destructor, etc.
{
public:
// constructor, destructor, etc.
@@
-33,14
+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):
// 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 // _WX_XPM_H_