No longer using the reserved pointer

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

diff --git a/include/wx/window.h b/include/wx/window.h
index b9a8332d5c94ff378eecd1c16fdab028de4a13e3..f2227aecb535c2172ec3de7d32cbc8278c918f87 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -73,8 +73,6 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxAccessible;
 #endif
 
 class WXDLLEXPORT wxAccessible;
 #endif
 

-class WXDLLEXPORT wxWindowExtraData;
-

 // ----------------------------------------------------------------------------
 // helper stuff used by wxWindow
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // helper stuff used by wxWindow
 // ----------------------------------------------------------------------------


@@ -1314,9 +1312,8 @@ protected:
     // implements the window variants
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 
     // implements the window variants
     virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
 

-    // Was a reserved pointer in 2.6.0, now used to hold extra data members
-    // without breaking compatibility.
-    wxWindowExtraData* m_extraData;
+    // Reserved for future use
+    void* m_windowReserved;

 
 private:
     // contains the last id generated by NewControlId
 
 private:
     // contains the last id generated by NewControlId

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index b46e7c9b5176481ab100b0302bb17ab8ac64e28f..c296441e771ee7e7b304c9a31d47cd117bead15d 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -216,9 +216,8 @@ wxWindowBase::wxWindowBase()
     // VZ: this one shouldn't exist...
     m_isBeingDeleted = false;
     
     // VZ: this one shouldn't exist...
     m_isBeingDeleted = false;
     

-    // Can be used in port specific wxWindow derived classes for holding extra
-    // data memebers.
-    m_extraData = NULL;
+    // Reserved for future use
+    m_windowReserved = NULL;

 }
 
 // common part of window creation process
 }
 
 // common part of window creation process