Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No longer using the reserved pointer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-05-19 22:16:02 +00:00
parent c571d9e817
commit 561a367d40
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/window.h
View File

@@ -73,8 +73,6 @@ class WXDLLEXPORT wxWindow;
class WXDLLEXPORT wxAccessible; class WXDLLEXPORT wxAccessible;
#endif #endif
class WXDLLEXPORT wxWindowExtraData;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// helper stuff used by wxWindow // helper stuff used by wxWindow
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -1314,9 +1312,8 @@ protected:
// implements the window variants // implements the window variants
virtual void DoSetWindowVariant( wxWindowVariant variant ) ; virtual void DoSetWindowVariant( wxWindowVariant variant ) ;
// Was a reserved pointer in 2.6.0, now used to hold extra data members // Reserved for future use
// without breaking compatibility. void* m_windowReserved;
wxWindowExtraData* m_extraData;
private: private:
// contains the last id generated by NewControlId // contains the last id generated by NewControlId

5
src/common/wincmn.cpp
View File

@@ -216,9 +216,8 @@ wxWindowBase::wxWindowBase()
// VZ: this one shouldn't exist... // VZ: this one shouldn't exist...
m_isBeingDeleted = false; m_isBeingDeleted = false;
// Can be used in port specific wxWindow derived classes for holding extra // Reserved for future use
// data memebers. m_windowReserved = NULL;
m_extraData = NULL;
} }
// common part of window creation process // common part of window creation process