derive wxConfig classes from wxObject and add wxRTTI macros to them (patch 1587607)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-10 18:16:10 +00:00
parent 125817d0e3
commit c4ec0ce820
10 changed files with 16 additions and 9 deletions

View File

@@ -23,7 +23,7 @@ so please have a \helpref{look at them.}{wxconfigstaticfunctions}
\wxheading{Derived from}
No base class
\helpref{wxObject}{wxobject}
\wxheading{Include files}

View File

@@ -236,6 +236,7 @@ private:
bool m_isDirty; // if true, we have unsaved changes
DECLARE_NO_COPY_CLASS(wxFileConfig)
DECLARE_ABSTRACT_CLASS(wxFileConfig)
};
#endif

View File

@@ -90,6 +90,9 @@ private:
wxString m_strLocalFilename; // name of the private INI file
wxString m_strGroup, // current group in appname.ini file
m_strPath; // the rest of the path (no trailing '_'!)
DECLARE_NO_COPY_CLASS(wxIniConfig)
DECLARE_ABSTRACT_CLASS(wxIniConfig)
};
#endif //_INICONF_H

View File

@@ -95,16 +95,15 @@ protected:
virtual bool DoWriteLong(const wxString& key, long lValue);
private:
// no copy ctor/assignment operator
wxRegConfig(const wxRegConfig&);
wxRegConfig& operator=(const wxRegConfig&);
// these keys are opened during all lifetime of wxRegConfig object
wxRegKey m_keyLocalRoot, m_keyLocal,
m_keyGlobalRoot, m_keyGlobal;
// current path (not '/' terminated)
wxString m_strPath;
DECLARE_NO_COPY_CLASS(wxRegConfig)
DECLARE_ABSTRACT_CLASS(wxRegConfig)
};
#endif //_REGCONF_H

View File

@@ -72,10 +72,6 @@ protected:
virtual bool DoWriteLong(const wxString& key, long lValue);
private:
// no copy ctor/assignment operator
wxPrefConfig(const wxPrefConfig&);
wxPrefConfig& operator=(const wxPrefConfig&);
// current path (not '/' terminated)
wxString m_strPath;
@@ -84,6 +80,9 @@ private:
// current group modified ?
bool m_modGroup;
DECLARE_NO_COPY_CLASS(wxPrefConfig)
DECLARE_ABSTRACT_CLASS(wxPrefConfig)
};
#endif // _PREFCONF_H_

View File

@@ -57,6 +57,7 @@ bool wxConfigBase::ms_bAutoCreate = true;
// ----------------------------------------------------------------------------
// wxConfigBase
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject)
// Not all args will always be used by derived classes, but including them all
// in each class ensures compatibility.

View File

@@ -377,6 +377,7 @@ wxString wxFileConfig::GetLocalFileName(const wxString& file)
// ----------------------------------------------------------------------------
// ctor
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase)
void wxFileConfig::Init()
{

View File

@@ -50,6 +50,7 @@
// ----------------------------------------------------------------------------
// ctor & dtor
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)
wxIniConfig::wxIniConfig(const wxString& strAppName,
const wxString& strVendor,

View File

@@ -60,6 +60,7 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, long *plVal)
// ----------------------------------------------------------------------------
// ctor/dtor
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxRegConfig, wxConfigBase)
// create the config object which stores its data under HKCU\vendor\app and, if
// style & wxCONFIG_USE_GLOBAL_FILE, under HKLM\vendor\app

View File

@@ -82,6 +82,7 @@ know structures of Preferences of other non wxW applications.
// ----------------------------------------------------------------------------
// ctor/dtor
// ----------------------------------------------------------------------------
IMPLEMENT_ABSTRACT_CLASS(wxPrefConfig, wxConfigBase)
wxPrefConfig::wxPrefConfig(const wxString& appName, const wxString& vendorName,
const wxString& strLocal, const wxString& strGlobal,