X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3732409acc7a1e0b3cdb1f0a5dec7cc49a4b28b..c571d9e817ed29bec4255f14857b59f82716963e:/include/wx/window.h diff --git a/include/wx/window.h b/include/wx/window.h index 19c6a01a25..b9a8332d5c 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -5,7 +5,7 @@ // Modified by: Ron Lee // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) wxWidgets team +// Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -73,6 +73,8 @@ class WXDLLEXPORT wxWindow; class WXDLLEXPORT wxAccessible; #endif +class WXDLLEXPORT wxWindowExtraData; + // ---------------------------------------------------------------------------- // helper stuff used by wxWindow // ---------------------------------------------------------------------------- @@ -1069,6 +1071,17 @@ public: // behaviour in the most common case virtual bool ShouldInheritColours() const { return false; } + // Reserved for future use + virtual void ReservedWindowFunc1() {} + virtual void ReservedWindowFunc2() {} + virtual void ReservedWindowFunc3() {} + virtual void ReservedWindowFunc4() {} + virtual void ReservedWindowFunc5() {} + virtual void ReservedWindowFunc6() {} + virtual void ReservedWindowFunc7() {} + virtual void ReservedWindowFunc8() {} + virtual void ReservedWindowFunc9() {} + protected: // event handling specific to wxWindow virtual bool TryValidator(wxEvent& event); @@ -1301,6 +1314,10 @@ protected: // implements the window variants virtual void DoSetWindowVariant( wxWindowVariant variant ) ; + // Was a reserved pointer in 2.6.0, now used to hold extra data members + // without breaking compatibility. + wxWindowExtraData* m_extraData; + private: // contains the last id generated by NewControlId static int ms_lastControlId;