wxWidgets3: update to svn r70933

This commit is contained in:
Shawn Hoffman
2012-03-17 18:12:27 -07:00
parent 0ed8af2287
commit a648aca65c
906 changed files with 39468 additions and 17244 deletions

View File

@ -4,7 +4,7 @@
// Author: Stefan Csomor
// Modified by: Francesco Montorsi
// Created: 27/07/03
// RCS-ID: $Id: xti.h 66646 2011-01-07 22:52:46Z SC $
// RCS-ID: $Id: xti.h 70396 2012-01-19 09:00:29Z SC $
// Copyright: (c) 1997 Julian Smart
// (c) 2003 Stefan Csomor
// Licence: wxWindows licence
@ -96,7 +96,7 @@ typedef bool (*wxObjectStreamingCallback) ( const wxObject *, wxObjectWriter *,
class WXDLLIMPEXP_BASE wxClassInfo
{
friend class WXDLLIMPEXP_BASE wxPropertyInfo;
friend class WXDLLIMPEXP_BASE wxHandlerInfo;
friend class /* WXDLLIMPEXP_BASE */ wxHandlerInfo;
friend wxObject *wxCreateDynamicObject(const wxString& name);
public:
@ -333,7 +333,6 @@ private:
wxPropertyInfoFn m_firstPropertyFn;
wxHandlerInfoFn m_firstHandlerFn;
mutable bool m_firstInited;
protected:
void EnsureInfosInited() const
@ -351,6 +350,8 @@ protected:
mutable wxHandlerInfo* m_firstHandler;
private:
mutable bool m_firstInited;
const wxClassInfo** m_parents;
const wxChar* m_unitName;