fixes #9982

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dlimpexp.h b/include/wx/dlimpexp.h
index 9c120f99b6a9c5058b51264623c085425245277e..d7495ecb9b161831e1ae07bdbc297334cdc5c043 100644 (file)
--- a/include/wx/dlimpexp.h
+++ b/include/wx/dlimpexp.h
@@ -98,12 +98,23 @@
 #ifdef WXMAKINGDLL_BASE
 #    define WXDLLIMPEXP_BASE WXEXPORT
 #    define WXDLLIMPEXP_DATA_BASE(type) WXEXPORT type
 #ifdef WXMAKINGDLL_BASE
 #    define WXDLLIMPEXP_BASE WXEXPORT
 #    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)
 #    define WXDLLIMPEXP_BASE WXIMPORT
 #    define WXDLLIMPEXP_DATA_BASE(type) WXIMPORT type
 #elif defined(WXUSINGDLL)
 #    define WXDLLIMPEXP_BASE WXIMPORT
 #    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 */
 #    define WXDLLIMPEXP_BASE
 #    define WXDLLIMPEXP_DATA_BASE(type) type
 #else /* not making nor using DLL */
 #    define WXDLLIMPEXP_BASE
 #    define WXDLLIMPEXP_DATA_BASE(type) type

+#    define WXDLLIMPEXP_INLINE_BASE

 #endif
 
 #ifdef WXMAKINGDLL_NET
 #endif
 
 #ifdef WXMAKINGDLL_NET

diff --git a/include/wx/wfstream.h b/include/wx/wfstream.h
index aea6b17e6d9075ea5c79a6ea45909cd9d2693a7c..da1e7c2d8792af3089b5f72c1b23e5958c978fff 100644 (file)
--- a/include/wx/wfstream.h
+++ b/include/wx/wfstream.h
@@ -93,8 +93,8 @@ public:
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }
     virtual ~wxTempFileOutputStream();
 
     bool Close() { return Commit(); }

-    WXEXPORT virtual bool Commit() { return m_file->Commit(); }
-    WXEXPORT virtual void Discard() { m_file->Discard(); }
+    WXDLLIMPEXP_INLINE_BASE virtual bool Commit() { return m_file->Commit(); }
+    WXDLLIMPEXP_INLINE_BASE virtual void Discard() { m_file->Discard(); }

 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }
 
     wxFileOffset GetLength() const { return m_file->Length(); }
     bool IsSeekable() const { return true; }