From 6021b8f80b7b64b5d50702864da5f139710527e4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 14 Mar 2006 16:04:33 +0000 Subject: [PATCH] we don't need reserved virtual functions on HEAD git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38073 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 | 11 ----------- include/wx/toplevel.h | 11 ----------- include/wx/window.h | 14 -------------- 7 files changed, 78 deletions(-) diff --git a/include/wx/control.h b/include/wx/control.h index c5b425e7e8..1432d67e5c 100644 --- a/include/wx/control.h +++ b/include/wx/control.h @@ -65,17 +65,6 @@ public: // wxControl-specific processing after processing the update event virtual void DoUpdateWindowUI(wxUpdateUIEvent& event); - // 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 e7683753d5..acb004af10 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -650,17 +650,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 5555127425..fe22a53056 100644 --- a/include/wx/notebook.h +++ b/include/wx/notebook.h @@ -90,14 +90,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 17e4682d6d..58e62f03be 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -471,18 +471,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 0c91e975f3..02ecb32f9b 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -71,17 +71,6 @@ public: // returns true if the streams supports seeking to arbitrary offsets virtual bool IsSeekable() const { return false; } - // 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 0359691c0b..b5a03d9b23 100644 --- a/include/wx/toplevel.h +++ b/include/wx/toplevel.h @@ -204,17 +204,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 f2de3e0e03..bb3c632505 100644 --- a/include/wx/window.h +++ b/include/wx/window.h @@ -1081,17 +1081,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); @@ -1338,9 +1327,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; -- 2.45.2