Removed unnecessary code from utilsunx.cpp

[wxWidgets.git] / include / wx / msw / regconf.h

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3cb0213720d34257b4475c9125098630b1d058e8..8cad906888c9d3fc52f6056b3fdce791815f4308 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/regconf.h  
+// Name:        msw/regconf.h

 // Purpose:     Registry based implementation of wxConfigBase
 // Author:      Vadim Zeitlin
 // Purpose:     Registry based implementation of wxConfigBase
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -24,13 +24,15 @@
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
 // wxRegConfig
 // ----------------------------------------------------------------------------
 

-class wxRegConfig : public wxConfigBase
+class WXDLLEXPORT wxRegConfig : public wxConfigBase

 {
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
 {
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName

-  wxRegConfig(const wxString& appName = "", const wxString& vendorName = "",
-              const wxString& localFilename = "", const wxString& globalFilename = "",
+  wxRegConfig(const wxString& appName = "",
+              const wxString& vendorName = "",
+              const wxString& localFilename = "",
+              const wxString& globalFilename = "",

               long style = 0);
 
     // dtor will save unsaved data
               long style = 0);
 
     // dtor will save unsaved data


@@ -53,6 +55,7 @@ public:
     // tests for existence
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
     // tests for existence
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;

+  virtual EntryType GetEntryType(const wxString& name) const;

 
     // get number of entries/subgroups in the current group, with or without
     // it's subgroups
 
     // get number of entries/subgroups in the current group, with or without
     // it's subgroups


@@ -62,35 +65,54 @@ public:
   // read/write
   bool Read(const wxString& key, wxString *pStr) const;
   bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) const;
   // read/write
   bool Read(const wxString& key, wxString *pStr) const;
   bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) const;

+       wxString Read(const wxString& key, const wxString& defVal) const
+                       { return wxConfigBase::Read(key, defVal); }
+  

   bool Read(const wxString& key, long *plResult) const;
   bool Read(const wxString& key, long *plResult) const;

-
+       bool Read(const wxString& key, long *pl, long defVal) const
+                       { return wxConfigBase::Read(key, pl, defVal); }
+  long Read(const wxString& key, long defVal) const
+                       { return wxConfigBase::Read(key, defVal); }
+  

   // The following are necessary to satisfy the compiler
   // The following are necessary to satisfy the compiler

-  wxString Read(const wxString& key, const wxString& defVal) const
-    { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, long *pl, long defVal) const
-    { return wxConfigBase::Read(key, pl, defVal); }

   bool Read(const wxString& key, int *pi, int defVal) const
   bool Read(const wxString& key, int *pi, int defVal) const

-    { return wxConfigBase::Read(key, pi, defVal); }
-  bool Read(const wxString& key, int *pi) const
-    { return wxConfigBase::Read(key, pi); }
-  long Read(const wxString& key, long defVal) const
-    { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, double* val) const
-    { return wxConfigBase::Read(key, val); }
-  bool Read(const wxString& key, double* val, double defVal) const
-    { return wxConfigBase::Read(key, val, defVal); }
-
+                       { return wxConfigBase::Read(key, pi, defVal); }
+       bool Read(const wxString& key, int *pi) const
+                       { return wxConfigBase::Read(key, pi); }
+
+       bool Read(const wxString& key, double* val, double defVal) const
+                       { return wxConfigBase::Read(key, val, defVal); }
+       bool Read(const wxString& key, double* val) const
+                       { return wxConfigBase::Read(key, val); }
+  
+       bool Read(const wxString& key, bool *pb, bool defVal) const
+                       { return wxConfigBase::Read(key, pb, defVal); }
+       bool Read(const wxString& key, bool *pb) const
+                       { return wxConfigBase::Read(key, pb); }
+  

   bool Write(const wxString& key, const wxString& szValue);
   bool Write(const wxString& key, long lValue);
   bool Write(const wxString& key, const wxString& szValue);
   bool Write(const wxString& key, long lValue);

+       bool Write(const wxString& key, double dValue)
+                       { return wxConfigBase::Write(key, dValue); }
+       bool Write(const wxString& key, bool bValue)
+                       { return wxConfigBase::Write(key, bValue); }

 
   virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return TRUE; }
 
 
   virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return TRUE; }
 

+  // rename
+  virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
+  virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
+

   // delete
   virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso);
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 
 private:
   // delete
   virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso);
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 
 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;
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;