test whether HAVE_VSWPRINTF is defined, not whether it's 0 or 1

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3a1bca89a1b334330cf96b6271d1cf4a24e13ca2..82ab6d14a3a9f9c8aacf39477048dbd7d09a3bff 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,14 +12,12 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 

-#ifdef __GNUG__
-#pragma interface "regconf.h"
-#endif
-

 #ifndef   _REGISTRY_H
   #include "wx/msw/registry.h"
 #endif
 #ifndef   _REGISTRY_H
   #include "wx/msw/registry.h"
 #endif

+

 #include "wx/object.h"
 #include "wx/object.h"

+#include "wx/confbase.h"

 
 // ----------------------------------------------------------------------------
 // wxRegConfig
 
 // ----------------------------------------------------------------------------
 // wxRegConfig


@@ -30,14 +28,14 @@ class WXDLLIMPEXP_BASE 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 = _T(""),
-              const wxString& vendorName = _T(""),
-              const wxString& localFilename = _T(""),
-              const wxString& globalFilename = _T(""),
-              long style = 0);
+  wxRegConfig(const wxString& appName = wxEmptyString,
+              const wxString& vendorName = wxEmptyString,
+              const wxString& localFilename = wxEmptyString,
+              const wxString& globalFilename = wxEmptyString,
+              long style = wxCONFIG_USE_GLOBAL_FILE);

 
     // dtor will save unsaved data
 
     // dtor will save unsaved data

-  virtual ~wxRegConfig();
+  virtual ~wxRegConfig(){}

 
   // implement inherited pure virtual functions
   // ------------------------------------------
 
   // implement inherited pure virtual functions
   // ------------------------------------------


@@ -60,17 +58,17 @@ public:
 
     // 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

-  virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const;

 
 

-  virtual bool Flush(bool WXUNUSED(bCurrentOnly) = FALSE) { return TRUE; }
+  virtual bool Flush(bool WXUNUSED(bCurrentOnly) = false) { return true; }

 
   // rename
   virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 
   // delete
 
   // 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 = TRUE);
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true);

   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 


@@ -97,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