merged optimizations from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16,15 +16,6 @@
|
||||
#pragma interface "registry.h"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// mutable hack (see also registry.cpp)
|
||||
// ----------------------------------------------------------------------------
|
||||
#if wxUSE_MUTABLE
|
||||
#define MUTABLE mutable
|
||||
#else
|
||||
#define MUTABLE
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// types used in this module
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -217,7 +208,17 @@ public:
|
||||
bool GetFirstKey (wxString& strKeyName , long& lIndex);
|
||||
bool GetNextKey (wxString& strKeyName , long& lIndex) const;
|
||||
|
||||
// for wxRegConfig usage only: preallocate some memory for the name
|
||||
void ReserveMemoryForName(size_t bytes) { m_strKey.reserve(bytes); }
|
||||
|
||||
private:
|
||||
// common part of all ctors
|
||||
void Init()
|
||||
{
|
||||
m_hKey = (WXHKEY) NULL;
|
||||
m_dwLastError = 0;
|
||||
}
|
||||
|
||||
// no copy ctor/assignment operator
|
||||
wxRegKey(const wxRegKey& key); // not implemented
|
||||
wxRegKey& operator=(const wxRegKey& key); // not implemented
|
||||
@@ -226,7 +227,7 @@ private:
|
||||
m_hRootKey; // handle of the top key (i.e. StdKey)
|
||||
wxString m_strKey; // key name (relative to m_hRootKey)
|
||||
|
||||
MUTABLE long m_dwLastError; // last error (0 if none)
|
||||
long m_dwLastError; // last error (0 if none)
|
||||
};
|
||||
|
||||
#endif //_REGISTRY_H
|
||||
|
Reference in New Issue
Block a user