Added some reserved functions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/control.h b/include/wx/control.h
index 98905ebe3ef8913ff2214a7be30d826feda0c6cc..a70c5a8be63812ecdfb04518c710ff9c9a59696d 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -66,6 +66,17 @@ 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 0e6d1d055bd64fce4005246461b4d0200891e5e2..9d467f85abd6a99f218ea30915e8e14455e12632 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -631,6 +631,17 @@ 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/toplevel.h b/include/wx/toplevel.h
index 6820f9cfeea223ca104b38fe78288d8b003dff57..ed79f0f1e4d5ac08ed88dc38262bade73c611db5 100644 (file)
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -206,6 +206,17 @@ 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 19c6a01a25196a5972ad227bbb7459fa456112e6..ad037aca486453662b9368f03ea83f3181178336 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1069,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);
@@ -1301,6 +1312,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;

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 4a3b32676e613adc0eb8560c67e0e03a33127a26..c296441e771ee7e7b304c9a31d47cd117bead15d 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -215,6 +215,9 @@ wxWindowBase::wxWindowBase()
 
     // VZ: this one shouldn't exist...
     m_isBeingDeleted = false;
+    
+    // Reserved for future use
+    m_windowReserved = NULL;
 }
 
 // common part of window creation process