projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added CreateSeparatedButtonSizer(), changed signature and semantics of CreateButtonSi...
[wxWidgets.git]
/
include
/
wx
/
xpmdecod.h
diff --git
a/include/wx/xpmdecod.h
b/include/wx/xpmdecod.h
index 13c1e86b9ee608cad8b786f7bcdd86a070ceaf44..96cdab77323f1e0cc7e8367252d806558544e8bc 100644
(file)
--- a/
include/wx/xpmdecod.h
+++ b/
include/wx/xpmdecod.h
@@
-10,16
+10,12
@@
#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 WXDLL
EXPORT
wxImage;
-class WXDLL
EXPORT
wxInputStream;
+class WXDLL
IMPEXP_CORE
wxImage;
+class WXDLL
IMPEXP_BASE
wxInputStream;
// --------------------------------------------------------------------------
// wxXPMDecoder class
// --------------------------------------------------------------------------
// wxXPMDecoder class
@@
-39,10
+35,10
@@
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);
};
};
+#endif // wxUSE_IMAGE && wxUSE_XPM
-#endif // wxUSE_IMAGE && wxUSE_XPM
-#endif // _WX_GIFDECOD_H_
+#endif // _WX_XPM_H_