AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
Show Stats 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;
#endif
class WXDLLEXPORT wxWindowExtraData;
// ----------------------------------------------------------------------------
// helper stuff used by wxWindow
// ----------------------------------------------------------------------------
@ -1314,9 +1312,8 @@ protected:
// 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

5
src/common/wincmn.cpp
View File

@ -216,9 +216,8 @@ wxWindowBase::wxWindowBase()
// 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