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

don't redeclare wxYield() if it had been already declared to fix g++ warnings with -Wredundant-decls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-02-08 08:17:41 +00:00
parent 7a71aa1402
commit a131b460ac
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/app.h
View File

@@ -633,9 +633,16 @@ protected:
// Force an exit from main loop // Force an exit from main loop
extern void WXDLLIMPEXP_BASE wxExit(); extern void WXDLLIMPEXP_BASE wxExit();
// avoid redeclaring this function here if it had been already declated by
// wx/utils.h, this results in warnings from g++ with -Wredundant-decls
#ifndef wx_YIELD_DECLARED
#define wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
extern bool WXDLLIMPEXP_BASE wxYield(); extern bool WXDLLIMPEXP_BASE wxYield();
#endif // wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
extern void WXDLLIMPEXP_BASE wxWakeUpIdle(); extern void WXDLLIMPEXP_BASE wxWakeUpIdle();

7
include/wx/utils.h
View File

@@ -733,9 +733,16 @@ inline struct _XDisplay *wxGetX11Display()
// wxYield(): these functions are obsolete, please use wxApp methods instead! // wxYield(): these functions are obsolete, please use wxApp methods instead!
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// avoid redeclaring this function here if it had been already declated by
// wx/app.h, this results in warnings from g++ with -Wredundant-decls
#ifndef wx_YIELD_DECLARED
#define wx_YIELD_DECLARED
// Yield to other apps/messages // Yield to other apps/messages
WXDLLIMPEXP_BASE bool wxYield(); WXDLLIMPEXP_BASE bool wxYield();
#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_BASE bool wxYieldIfNeeded();