From 847379b00c3349dc693535b65296b92cc4646897 Mon Sep 17 00:00:00 2001 From: Ron Lee Date: Fri, 24 Jun 2005 16:44:20 +0000 Subject: [PATCH] Put a humane end to the pathetic flailing over whether this can work or not. It obviously never can if you understand the rules for binary compatibility of a userspace library and the mechanisms to manage it -- no matter how clever we get in the future. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/control.h | 11 ----------- include/wx/dc.h | 11 ----------- include/wx/notebook.h | 8 -------- include/wx/object.h | 12 ------------ include/wx/stream.h | 12 ------------ include/wx/toplevel.h | 11 ----------- include/wx/window.h | 14 -------------- src/common/wincmn.cpp | 4 +--- 8 files changed, 1 insertion(+), 82 deletions(-) diff --git a/include/wx/control.h b/include/wx/control.h index a70c5a8..98905eb 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -66,17 +66,6 @@ public: virtual void SetLabel( const wxString &label ); virtual bool SetFont(const wxFont& font); - // Reserved for future use - virtual void ReservedControlFunc1() {} - virtual void ReservedControlFunc2() {} - virtual void ReservedControlFunc3() {} - virtual void ReservedControlFunc4() {} - virtual void ReservedControlFunc5() {} - virtual void ReservedControlFunc6() {} - virtual void ReservedControlFunc7() {} - virtual void ReservedControlFunc8() {} - virtual void ReservedControlFunc9() {} - protected: // creates the control (calls wxWindowBase::CreateBase inside) and adds it // to the list of parents children diff --git a/include/wx/dc.h b/include/wx/dc.h index 9d467f8..0e6d1d0 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -631,17 +631,6 @@ public: if (h) *h = hh; } - // Reserved for future use - virtual void ReservedDCFunc1() {} - virtual void ReservedDCFunc2() {} - virtual void ReservedDCFunc3() {} - virtual void ReservedDCFunc4() {} - virtual void ReservedDCFunc5() {} - virtual void ReservedDCFunc6() {} - virtual void ReservedDCFunc7() {} - virtual void ReservedDCFunc8() {} - virtual void ReservedDCFunc9() {} - protected: // the pure virtual functions which should be implemented by wxDC virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, diff --git a/include/wx/notebook.h b/include/wx/notebook.h index 78523bd..4920f01 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -94,14 +94,6 @@ public: // On platforms that support it, get the theme page background colour, else invalid colour virtual wxColour GetThemeBackgroundColour() const { return wxNullColour; } - - // Reserved for future use - virtual void ReservedNotebookFunc1() {} - virtual void ReservedNotebookFunc2() {} - virtual void ReservedNotebookFunc3() {} - virtual void ReservedNotebookFunc4() {} - virtual void ReservedNotebookFunc5() {} - protected: DECLARE_NO_COPY_CLASS(wxNotebookBase) }; diff --git a/include/wx/object.h b/include/wx/object.h index 8f949c0..c249372 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -468,18 +468,6 @@ public: // destroy a reference void UnRef(); - - // Reserved for future use - virtual void ReservedObjectFunc1() {} - virtual void ReservedObjectFunc2() {} - virtual void ReservedObjectFunc3() {} - virtual void ReservedObjectFunc4() {} - virtual void ReservedObjectFunc5() {} - virtual void ReservedObjectFunc6() {} - virtual void ReservedObjectFunc7() {} - virtual void ReservedObjectFunc8() {} - virtual void ReservedObjectFunc9() {} - protected: // ensure that our data is not shared with anybody else: if we have no // data, it is created using CreateRefData() below, if we have shared data diff --git a/include/wx/stream.h b/include/wx/stream.h index d40eb66..53714e8 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -94,18 +94,6 @@ public: wxDEPRECATED( size_t StreamSize() const ); #endif // WXWIN_COMPATIBILITY_2_2 - - // Reserved for future use - virtual void ReservedStreamFunc1() {} - virtual void ReservedStreamFunc2() {} - virtual void ReservedStreamFunc3() {} - virtual void ReservedStreamFunc4() {} - virtual void ReservedStreamFunc5() {} - virtual void ReservedStreamFunc6() {} - virtual void ReservedStreamFunc7() {} - virtual void ReservedStreamFunc8() {} - virtual void ReservedStreamFunc9() {} - protected: virtual wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode); virtual wxFileOffset OnSysTell() const; diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h index ed79f0f..6820f9c 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -206,17 +206,6 @@ public: // do the window-specific processing after processing the update event virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) ; - // Reserved for future use - virtual void ReservedTopLevelWindowFunc1() {} - virtual void ReservedTopLevelWindowFunc2() {} - virtual void ReservedTopLevelWindowFunc3() {} - virtual void ReservedTopLevelWindowFunc4() {} - virtual void ReservedTopLevelWindowFunc5() {} - virtual void ReservedTopLevelWindowFunc6() {} - virtual void ReservedTopLevelWindowFunc7() {} - virtual void ReservedTopLevelWindowFunc8() {} - virtual void ReservedTopLevelWindowFunc9() {} - protected: // the frame client to screen translation should take account of the // toolbar which may shift the origin of the client area diff --git a/include/wx/window.h b/include/wx/window.h index cb66b14..8e8dcf9 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1073,17 +1073,6 @@ 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); @@ -1316,9 +1305,6 @@ 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; diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 8dbe626..831933a 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -215,9 +215,7 @@ wxWindowBase::wxWindowBase() // VZ: this one shouldn't exist... m_isBeingDeleted = false; - - // Reserved for future use - m_windowReserved = NULL; + } // common part of window creation process -- 2.7.4