From: Vadim Zeitlin Date: Sat, 2 May 2009 15:31:14 +0000 (+0000) Subject: don't use access declarations with Watcom which doesn't support them correctly (close... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f27683e7da19d04876c4fbd7464cd1dd298f1338 don't use access declarations with Watcom which doesn't support them correctly (closes #10749) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/window.h b/include/wx/window.h index d956ab0d5c..c9243e7027 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -820,6 +820,10 @@ public: virtual void SetNextHandler(wxEvtHandler *handler); virtual void SetPreviousHandler(wxEvtHandler *handler); + + // Watcom doesn't allow reducing access with using access declaration, see + // #10749 +#ifndef __WATCOMC__ protected: // NOTE: we change the access specifier of the following wxEvtHandler functions @@ -839,6 +843,7 @@ protected: using wxEvtHandler::ProcessPendingEvents; using wxEvtHandler::AddPendingEvent; using wxEvtHandler::QueueEvent; +#endif // __WATCOMC__ public: