X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/847379b00c3349dc693535b65296b92cc4646897..d8fd7acb8b877599b410e07a4c26dde92a676a82:/include/wx/window.h diff --git a/include/wx/window.h b/include/wx/window.h index 8e8dcf9bd2..7f516e51e4 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -12,10 +12,6 @@ #ifndef _WX_WINDOW_H_BASE_ #define _WX_WINDOW_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "windowbase.h" -#endif - // ---------------------------------------------------------------------------- // headers which we must include here // ---------------------------------------------------------------------------- @@ -1073,6 +1069,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); @@ -1272,6 +1279,14 @@ protected: // same size as it would have after a call to Fit() virtual wxSize DoGetBestSize() const; + // called from DoGetBestSize() to convert best virtual size (returned by + // the window sizer) to the best size for the window itself; this is + // overridden at wxScrolledWindow level to clump down virtual size to real + virtual wxSize GetWindowSizeForVirtualSize(const wxSize& size) const + { + return size; + } + // this is the virtual function to be overriden in any derived class which // wants to change how SetSize() or Move() works - it is called by all // versions of these functions in the base class @@ -1305,6 +1320,9 @@ protected: // implements the window variants virtual void DoSetWindowVariant( wxWindowVariant variant ) ; + // Reserved for future use + void* m_windowReserved; + private: // contains the last id generated by NewControlId static int ms_lastControlId;