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

diff --git a/include/wx/control.h b/include/wx/control.h
index c5b425e7e8da9132a284fac6c375b209d24e84d8..1432d67e5cf14169993ddac808546f18b19bac71 100644 (file)
--- 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 e7683753d5a0262b14e96c2d9b1afbcd89c150d7..acb004af104f0376e72162d9b92cdcbfcd6fa161 100644 (file)
--- 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 5555127425a0ac6a4c77f9fbd25763d7860ceabf..fe22a53056edb261255e30df2aeada392dca41ee 100644 (file)
--- 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 17e4682d6d3b5c31c86225441b5c013229a44c55..58e62f03beecbdb4d19b600d1515960ba8b3e83e 100644 (file)
--- 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 0c91e975f3c91950ddd1feb792f1f465fea3cca3..02ecb32f9bc93db03caff3d1d6d680529bf15788 100644 (file)
--- 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 0359691c0b80f0fb016a1c83b0288340f5633531..b5a03d9b23cfbe98f42588250ac045deefb3e1c0 100644 (file)
--- 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 f2de3e0e0331e980dfb97dc5a91515a4a23d6e8f..bb3c6325055f34ccf1e4258e104c0ad05e8a2a66 100644 (file)
--- 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;