Fixed property list OnClose problem that caused Dialog Editor problem

[wxWidgets.git] / include / wx / confbase.h

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 1b51cae5265fde8163ec58c77d2cf3b2ef1f3f8e..edbe8ca2ca18da5204c426cca281c9db838cf920 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -18,14 +18,11 @@
 #pragma interface "confbase.h"
 #endif
 
-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#include "wx/defs.h"
 
-// it won't compile without it anyhow
-#ifndef wxUSE_CONFIG
-  #error "Please define wxUSE_CONFIG or remove config.cpp from your makefile"
-#endif // wxUSE_CONFIG
+#if wxUSE_CONFIG
+
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -76,7 +73,7 @@ extern wxString wxExpandEnvVars(const wxString &sz);
 extern void wxSplitPath(wxArrayString& aParts, const char *sz);
 
 // ----------------------------------------------------------------------------
-// abstract base class wxConfigBase which defines the interface for derived 
+// abstract base class wxConfigBase which defines the interface for derived
 // classes
 //
 // wxConfig organizes the items in a tree-like structure (modeled after the
@@ -86,7 +83,7 @@ extern void wxSplitPath(wxArrayString& aParts, const char *sz);
 // Keys are pairs "key_name = value" where value may be of string or integer
 // (long) type (@@@ doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
-class wxConfigBase
+class WXDLLEXPORT wxConfigBase
 {
 public:
   // static functions
@@ -112,8 +109,8 @@ public:
   // Not all args will always be used by derived classes, but
   // including them all in each class ensures compatibility.
   // If appName is empty, uses wxApp name
-  wxConfigBase(const wxString& appName = "", const wxString& vendorName = "",
-               const wxString& localFilename = "", const wxString& globalFilename = "",
+  wxConfigBase(const wxString& appName = wxEmptyString, const wxString& vendorName = wxEmptyString,
+               const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
                long style = 0);
 
     // empty but ensures that dtor of all derived classes is virtual
@@ -155,7 +152,7 @@ public:
   virtual bool Read(const wxString& key, wxString *pStr) const = 0;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defVal) const;
 
-  virtual wxString Read(const wxString& key, const wxString& defVal = "") const;
+  virtual wxString Read(const wxString& key, const wxString& defVal = wxEmptyString) const;
 
   virtual bool Read(const wxString& key, long *pl) const = 0;
   virtual bool Read(const wxString& key, long *pl, long defVal) const;
@@ -188,6 +185,15 @@ public:
     // permanently writes all changes
   virtual bool Flush(bool bCurrentOnly = FALSE) = 0;
 
+  // renaming, all functions return FALSE on failure (probably because the new
+  // name is already taken by an existing entry)
+    // rename an entry
+  virtual bool RenameEntry(const wxString& oldName,
+                           const wxString& newName) = 0;
+    // rename a group
+  virtual bool RenameGroup(const wxString& oldName,
+                           const wxString& newName) = 0;
+
   // delete entries/groups
     // deletes the specified entry and the group it belongs to if
     // it was the last key in it and the second parameter is true
@@ -222,14 +228,18 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
-    { return key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #ifndef __WXMAC__
+    { return !key.IsEmpty() && key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #else
+    { return !key.IsEmpty() && key[0ul] == wxCONFIG_IMMUTABLE_PREFIX; }
+  #endif
 
 private:
   // are we doing automatic environment variable expansion?
   bool m_bExpandEnvVars;
   // do we record default values?
   bool m_bRecordDefaults;
-  
+
   // static variables
   static wxConfigBase *ms_pConfig;
   static bool          ms_bAutoCreate;
@@ -283,7 +293,10 @@ private:
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 
+#endif 
+ 
+  // wxUSE_CONFIG
 
-
-#endif  // _WX_CONFIG_H_
+#endif
+  // _WX_CONFIG_H_