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

fix wxYield[IfNeeded] dll linkage (closes #10325)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-01-07 11:28:50 +00:00
parent 06fe46e2ff
commit 3828182615
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/app.h
View File

@@ -648,7 +648,7 @@ protected:
// ------------------------------------------------------ // ------------------------------------------------------
// Force an exit from main loop // Force an exit from main loop
extern void WXDLLIMPEXP_BASE wxExit(); WXDLLIMPEXP_BASE void wxExit();
// avoid redeclaring this function here if it had been already declated by // avoid redeclaring this function here if it had been already declated by
// wx/utils.h, this results in warnings from g++ with -Wredundant-decls // wx/utils.h, this results in warnings from g++ with -Wredundant-decls
@@ -656,12 +656,12 @@ extern void WXDLLIMPEXP_BASE wxExit();
#define wx_YIELD_DECLARED #define wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
extern bool WXDLLIMPEXP_BASE wxYield(); WXDLLIMPEXP_CORE bool wxYield();
#endif // wx_YIELD_DECLARED #endif // wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
extern void WXDLLIMPEXP_BASE wxWakeUpIdle(); WXDLLIMPEXP_BASE void wxWakeUpIdle();
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// macros for dynamic creation of the application object // macros for dynamic creation of the application object

8
include/wx/utils.h
View File

@@ -713,16 +713,12 @@ inline struct _XDisplay *wxGetX11Display()
#define wx_YIELD_DECLARED #define wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
WXDLLIMPEXP_BASE bool wxYield(); WXDLLIMPEXP_CORE bool wxYield();
#endif // wx_YIELD_DECLARED #endif // wx_YIELD_DECLARED
// Like wxYield, but fails silently if the yield is recursive. // Like wxYield, but fails silently if the yield is recursive.
WXDLLIMPEXP_BASE bool wxYieldIfNeeded(); WXDLLIMPEXP_CORE bool wxYieldIfNeeded();
// ----------------------------------------------------------------------------
// Error message functions used by wxWidgets (deprecated, use wxLog)
// ----------------------------------------------------------------------------
#endif #endif
// _WX_UTILSH__ // _WX_UTILSH__