Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #9982

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-09-21 19:04:42 +00:00
parent ed33cad79e
commit 5f9c3802c1
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/dlimpexp.h
View File

@@ -98,12 +98,23 @@
#ifdef WXMAKINGDLL_BASE #ifdef WXMAKINGDLL_BASE
# define WXDLLIMPEXP_BASE WXEXPORT # define WXDLLIMPEXP_BASE WXEXPORT
# define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type # define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
# if defined(HAVE_VISIBILITY)
# define WXDLLIMPEXP_INLINE_BASE WXEXPORT
# else
# define WXDLLIMPEXP_INLINE_BASE
# endif
#elif defined(WXUSINGDLL) #elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_BASE WXIMPORT # define WXDLLIMPEXP_BASE WXIMPORT
# define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type # define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
# if defined(HAVE_VISIBILITY)
# define WXDLLIMPEXP_INLINE_BASE WXIMPORT
# else
# define WXDLLIMPEXP_INLINE_BASE
# endif
#else /* not making nor using DLL */ #else /* not making nor using DLL */
# define WXDLLIMPEXP_BASE # define WXDLLIMPEXP_BASE
# define WXDLLIMPEXP_DATA_BASE(type) type # define WXDLLIMPEXP_DATA_BASE(type) type
# define WXDLLIMPEXP_INLINE_BASE
#endif #endif
#ifdef WXMAKINGDLL_NET #ifdef WXMAKINGDLL_NET

4
include/wx/wfstream.h
View File

@@ -93,8 +93,8 @@ public:
virtual ~wxTempFileOutputStream(); virtual ~wxTempFileOutputStream();
bool Close() { return Commit(); } bool Close() { return Commit(); }
WXEXPORT virtual bool Commit() { return m_file->Commit(); } WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
WXEXPORT virtual void Discard() { m_file->Discard(); } WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }
wxFileOffset GetLength() const { return m_file->Length(); } wxFileOffset GetLength() const { return m_file->Length(); }
bool IsSeekable() const { return true; } bool IsSeekable() const { return true; }