From bb24c68f3502746147337c3f502cc1c957bcfb35 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 4 Jul 2003 13:00:07 +0000 Subject: [PATCH] compilation fixes for multilib/DLL build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/apptrait.h | 2 +- include/wx/datetime.h | 6 ++++-- include/wx/init.h | 12 ++++++------ include/wx/msw/apptbase.h | 2 +- include/wx/msw/apptrait.h | 4 ++-- include/wx/msw/private.h | 4 ++-- include/wx/thread.h | 40 +++++++++++++++++++-------------------- src/common/sysopt.cpp | 2 +- 8 files changed, 37 insertions(+), 35 deletions(-) diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index d8f4975166..e251e6e3ea 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -96,7 +96,7 @@ public: #else // no platform-specific methods to add to wxAppTraits typedef // wxAppTraits must be a class because it was forward declared as class - class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase + class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase { }; #endif // platform diff --git a/include/wx/datetime.h b/include/wx/datetime.h index 059ad5316d..5fb55a5284 100644 --- a/include/wx/datetime.h +++ b/include/wx/datetime.h @@ -1287,7 +1287,7 @@ private: #include "wx/dynarray.h" -WX_DECLARE_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray); +WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray, WXDLLIMPEXP_BASE); // ---------------------------------------------------------------------------- // wxDateTimeHolidayAuthority: an object of this class will decide whether a @@ -1299,7 +1299,9 @@ WX_DECLARE_EXPORTED_OBJARRAY(wxDateTime, wxDateTimeArray); // ---------------------------------------------------------------------------- class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority; -WX_DEFINE_EXPORTED_ARRAY(wxDateTimeHolidayAuthority *, wxHolidayAuthoritiesArray); +WX_DEFINE_USER_EXPORTED_ARRAY(wxDateTimeHolidayAuthority *, + wxHolidayAuthoritiesArray, + WXDLLIMPEXP_BASE); class wxDateTimeHolidaysModule; class WXDLLIMPEXP_BASE wxDateTimeHolidayAuthority diff --git a/include/wx/init.h b/include/wx/init.h index 5b6672c9a7..7fe4515597 100644 --- a/include/wx/init.h +++ b/include/wx/init.h @@ -26,11 +26,11 @@ // // note that the parameters may be modified, this is why we pass them by // reference! -extern bool WXDLLEXPORT wxEntryStart(int& argc, wxChar **argv); +extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, wxChar **argv); // free the resources allocated by the library in wxEntryStart() and shut it // down (wxEntryStart() may be called again afterwards if necessary) -extern void WXDLLEXPORT wxEntryCleanup(); +extern void WXDLLIMPEXP_BASE wxEntryCleanup(); // ---------------------------------------------------------------------------- @@ -42,7 +42,7 @@ extern void WXDLLEXPORT wxEntryCleanup(); // but this one always exists under all platforms // // returns the program exit code -extern int WXDLLEXPORT wxEntry(int& argc, wxChar **argv); +extern int WXDLLIMPEXP_BASE wxEntry(int& argc, wxChar **argv); // ---------------------------------------------------------------------------- @@ -53,15 +53,15 @@ extern int WXDLLEXPORT wxEntry(int& argc, wxChar **argv); // initialize the library (may be called as many times as needed, but each // call to wxInitialize() must be matched by wxUninitialize()) -extern bool WXDLLEXPORT wxInitialize(int argc = 0, wxChar **argv = NULL); +extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, wxChar **argv = NULL); // clean up -- the library can't be used any more after the last call to // wxUninitialize() -extern void WXDLLEXPORT wxUninitialize(); +extern void WXDLLIMPEXP_BASE wxUninitialize(); // create an object of this class on stack to initialize/cleanup the library // automatically -class WXDLLEXPORT wxInitializer +class WXDLLIMPEXP_BASE wxInitializer { public: // initialize the library diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h index e7cfa68886..ce0dc36d10 100644 --- a/include/wx/msw/apptbase.h +++ b/include/wx/msw/apptbase.h @@ -16,7 +16,7 @@ // wxAppTraits: the MSW version adds extra hooks needed by MSW-only code // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase +class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase { public: // wxExecute() support methods diff --git a/include/wx/msw/apptrait.h b/include/wx/msw/apptrait.h index 86e7a1014f..a85f992051 100644 --- a/include/wx/msw/apptrait.h +++ b/include/wx/msw/apptrait.h @@ -16,7 +16,7 @@ // wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxConsoleAppTraits : public wxConsoleAppTraitsBase +class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase { public: virtual void *BeforeChildWaitLoop(); @@ -28,7 +28,7 @@ public: #if wxUSE_GUI -class WXDLLEXPORT wxGUIAppTraits : public wxGUIAppTraitsBase +class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase { public: virtual void *BeforeChildWaitLoop(); diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 3cda5809f9..e4ef38d0d2 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -494,10 +494,10 @@ WXDLLIMPEXP_DATA_BASE(extern HINSTANCE) wxhInstance; extern "C" { - WXDLLEXPORT HINSTANCE wxGetInstance(); + WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(); } -WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); +WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst); #if wxUSE_GUI diff --git a/include/wx/thread.h b/include/wx/thread.h index 401d5f5937..24046e1d5a 100644 --- a/include/wx/thread.h +++ b/include/wx/thread.h @@ -114,10 +114,10 @@ enum wxMutexType }; // forward declarations -class WXDLLEXPORT wxConditionInternal; -class WXDLLEXPORT wxMutexInternal; -class WXDLLEXPORT wxSemaphoreInternal; -class WXDLLEXPORT wxThreadInternal; +class WXDLLIMPEXP_BASE wxConditionInternal; +class WXDLLIMPEXP_BASE wxMutexInternal; +class WXDLLIMPEXP_BASE wxSemaphoreInternal; +class WXDLLIMPEXP_BASE wxThreadInternal; // ---------------------------------------------------------------------------- // A mutex object is a synchronization object whose state is set to signaled @@ -128,7 +128,7 @@ class WXDLLEXPORT wxThreadInternal; // you should consider wxMutexLocker whenever possible instead of directly // working with wxMutex class - it is safer -class WXDLLEXPORT wxMutex +class WXDLLIMPEXP_BASE wxMutex { public: // constructor & destructor @@ -171,7 +171,7 @@ protected: // a helper class which locks the mutex in the ctor and unlocks it in the dtor: // this ensures that mutex is always unlocked, even if the function returns or // throws an exception before it reaches the end -class WXDLLEXPORT wxMutexLocker +class WXDLLIMPEXP_BASE wxMutexLocker { public: // lock the mutex in the ctor @@ -220,7 +220,7 @@ private: // you should consider wxCriticalSectionLocker whenever possible instead of // directly working with wxCriticalSection class - it is safer -class WXDLLEXPORT wxCriticalSection +class WXDLLIMPEXP_BASE wxCriticalSection { public: // ctor & dtor @@ -277,7 +277,7 @@ private: // wxCriticalSectionLocker is the same to critical sections as wxMutexLocker is // to th mutexes -class WXDLLEXPORT wxCriticalSectionLocker +class WXDLLIMPEXP_BASE wxCriticalSectionLocker { public: wxCriticalSectionLocker(wxCriticalSection& cs) @@ -302,7 +302,7 @@ private: // thread(s) to wait until some condition is fulfilled // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxCondition +class WXDLLIMPEXP_BASE wxCondition { public: // Each wxCondition object is associated with a (single) wxMutex object. @@ -364,7 +364,7 @@ private: // a shared resource // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxSemaphore +class WXDLLIMPEXP_BASE wxSemaphore { public: // specifying a maxcount of 0 actually makes wxSemaphore behave as if there @@ -419,7 +419,7 @@ private: typedef unsigned long wxThreadIdType; #endif -class WXDLLEXPORT wxThread +class WXDLLIMPEXP_BASE wxThread { public: // the return type for the thread function @@ -586,8 +586,8 @@ private: // ---------------------------------------------------------------------------- // GUI mutex handling. -void WXDLLEXPORT wxMutexGuiEnter(); -void WXDLLEXPORT wxMutexGuiLeave(); +void WXDLLIMPEXP_BASE wxMutexGuiEnter(); +void WXDLLIMPEXP_BASE wxMutexGuiLeave(); // macros for entering/leaving critical sections which may be used without // having to take them inside "#if wxUSE_THREADS" @@ -604,8 +604,8 @@ inline bool wxIsMainThread() { return wxThread::IsMain(); } #else // !wxUSE_THREADS // no thread support -inline void WXDLLEXPORT wxMutexGuiEnter() { } -inline void WXDLLEXPORT wxMutexGuiLeave() { } +inline void WXDLLIMPEXP_BASE wxMutexGuiEnter() { } +inline void WXDLLIMPEXP_BASE wxMutexGuiLeave() { } // macros for entering/leaving critical sections which may be used without // having to take them inside "#if wxUSE_THREADS" @@ -642,7 +642,7 @@ inline bool wxIsMainThread() { return true; } wxCRIT_SECT_LOCKER(cs##name##Locker, s_cs##name) // automatically lock GUI mutex in ctor and unlock it in dtor -class WXDLLEXPORT wxMutexGuiLocker +class WXDLLIMPEXP_BASE wxMutexGuiLocker { public: wxMutexGuiLocker() { wxMutexGuiEnter(); } @@ -659,19 +659,19 @@ public: // unlock GUI if there are threads waiting for and lock it back when // there are no more of them - should be called periodically by the main // thread - extern void WXDLLEXPORT wxMutexGuiLeaveOrEnter(); + extern void WXDLLIMPEXP_BASE wxMutexGuiLeaveOrEnter(); // returns TRUE if the main thread has GUI lock - extern bool WXDLLEXPORT wxGuiOwnedByMainThread(); + extern bool WXDLLIMPEXP_BASE wxGuiOwnedByMainThread(); #ifndef __WXPM__ // wakes up the main thread if it's sleeping inside ::GetMessage() - extern void WXDLLEXPORT wxWakeUpMainThread(); + extern void WXDLLIMPEXP_BASE wxWakeUpMainThread(); #endif // !OS/2 // return TRUE if the main thread is waiting for some other to terminate: // wxApp then should block all "dangerous" messages - extern bool WXDLLEXPORT wxIsWaitingForThread(); + extern bool WXDLLIMPEXP_BASE wxIsWaitingForThread(); #endif // MSW, Mac, OS/2 #endif // wxUSE_THREADS diff --git a/src/common/sysopt.cpp b/src/common/sysopt.cpp index 39849e7fa9..6bc09e7de1 100644 --- a/src/common/sysopt.cpp +++ b/src/common/sysopt.cpp @@ -46,7 +46,7 @@ // singleton class so it can't be done in the dtor) class wxSystemOptionsModule : public wxModule { - friend class WXDLLEXPORT wxSystemOptions; + friend class WXDLLIMPEXP_BASE wxSystemOptions; public: virtual bool OnInit(); virtual void OnExit(); -- 2.45.2