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

diff --git a/docs/latex/wx/config.tex b/docs/latex/wx/config.tex
index d944febb1d8059800bdebd57eaf1fe10a2b34351..89254cf77363beb24009fbaeb7c9b857a12eaef0 100644 (file)
--- a/docs/latex/wx/config.tex
+++ b/docs/latex/wx/config.tex
@@ -23,7 +23,7 @@ so please have a \helpref{look at them.}{wxconfigstaticfunctions}
 
 \wxheading{Derived from}
 
 
 \wxheading{Derived from}
 

-No base class
+\helpref{wxObject}{wxobject}

 
 \wxheading{Include files}
 
 
 \wxheading{Include files}
 

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index 0c42cfe4cf0275cd35ae6ba325ca281518344637..1a3a07304108025b8ef00ec07c996c9a1e3a0dc6 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -236,6 +236,7 @@ private:
   bool m_isDirty;                       // if true, we have unsaved changes
 
   DECLARE_NO_COPY_CLASS(wxFileConfig)
   bool m_isDirty;                       // if true, we have unsaved changes
 
   DECLARE_NO_COPY_CLASS(wxFileConfig)

+  DECLARE_ABSTRACT_CLASS(wxFileConfig)

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h
index 81872a9290591aa4db99b942a5fb52274d41ac47..948825de3468522905ba5a38895a736c6834031c 100644 (file)
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -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 '_'!)
   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
 };
 
 #endif  //_INICONF_H

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index ff886d1796c15d663e8d746b30d431cda49ab001..82ab6d14a3a9f9c8aacf39477048dbd7d09a3bff 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -95,16 +95,15 @@ protected:
   virtual bool DoWriteLong(const wxString& key, long lValue);
 
 private:
   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;
   // 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
 };
 
 #endif  //_REGCONF_H

diff --git a/include/wx/palmos/prefconf.h b/include/wx/palmos/prefconf.h
index e5f7f4104ac3386dabe1fd1a782036647e390590..ba756045c2f208a4b5a0d2c6e79d3bf3cc341b35 100644 (file)
--- a/include/wx/palmos/prefconf.h
+++ b/include/wx/palmos/prefconf.h
@@ -72,10 +72,6 @@ protected:
   virtual bool DoWriteLong(const wxString& key, long lValue);
 
 private:
   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;
 
   // current path (not '/' terminated)
   wxString  m_strPath;
 


@@ -84,6 +80,9 @@ private:
 
   // current group modified ?
   bool m_modGroup;
 
   // current group modified ?
   bool m_modGroup;

+
+  DECLARE_NO_COPY_CLASS(wxPrefConfig)
+  DECLARE_ABSTRACT_CLASS(wxPrefConfig)

 };
 
 #endif // _PREFCONF_H_
 };
 
 #endif // _PREFCONF_H_

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 16cc86d8f28c5b728d6b6c0fda5643f0a0f03332..dadcf71c56b30704bde14df50d43f01ff9af6d72 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -57,6 +57,7 @@ bool          wxConfigBase::ms_bAutoCreate = true;
 // ----------------------------------------------------------------------------
 // wxConfigBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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.
 
 // Not all args will always be used by derived classes, but including them all
 // in each class ensures compatibility.

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 09731e4194f6e4c85a9ecf5882ac2f96706ca80f..f0ce4ed3aca11e1783ae1a4f452f8715cfa8f1d6 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -377,6 +377,7 @@ wxString wxFileConfig::GetLocalFileName(const wxString& file)
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxFileConfig, wxConfigBase)

 
 void wxFileConfig::Init()
 {
 
 void wxFileConfig::Init()
 {

diff --git a/src/msw/iniconf.cpp b/src/msw/iniconf.cpp
index cce629bbc2d8c50f3ed64f7ebc6c577129d15e52..020746e828e8bcd5d7c2ba8067b825f5f5edbc5b 100644 (file)
--- a/src/msw/iniconf.cpp
+++ b/src/msw/iniconf.cpp
@@ -50,6 +50,7 @@
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor & dtor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxIniConfig, wxConfigBase)

 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,
 
 wxIniConfig::wxIniConfig(const wxString& strAppName,
                          const wxString& strVendor,

diff --git a/src/msw/regconf.cpp b/src/msw/regconf.cpp
index 71b62aeb95e74cbd218b619f4921d01422e9ceef..19481f6b37dae8010270b257f1bd7f6aa350a41a 100644 (file)
--- a/src/msw/regconf.cpp
+++ b/src/msw/regconf.cpp
@@ -60,6 +60,7 @@ bool TryGetValue(const wxRegKey& key, const wxString& str, long *plVal)
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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
 
 // create the config object which stores its data under HKCU\vendor\app and, if
 // style & wxCONFIG_USE_GLOBAL_FILE, under HKLM\vendor\app

diff --git a/src/palmos/prefconf.cpp b/src/palmos/prefconf.cpp
index b8a029f7b3392b059772b6d12b6a1550ac1ea384..288e91f178150119e7aaa32903bde376e15ceae9 100644 (file)
--- a/src/palmos/prefconf.cpp
+++ b/src/palmos/prefconf.cpp
@@ -82,6 +82,7 @@ know structures of Preferences of other non wxW applications.
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------

+IMPLEMENT_ABSTRACT_CLASS(wxPrefConfig, wxConfigBase)

 
 wxPrefConfig::wxPrefConfig(const wxString& appName, const wxString& vendorName,
                            const wxString& strLocal, const wxString& strGlobal,
 
 wxPrefConfig::wxPrefConfig(const wxString& appName, const wxString& vendorName,
                            const wxString& strLocal, const wxString& strGlobal,