one additional assign

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 58f3b646fbc024aa5a37368cafc66e69237965aa..9bff8dedb5b595087aab98e117814afaf2f798e2 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -166,7 +166,7 @@ public:
   bool Read(const wxString& key, long *pl) const;
   bool Read(const wxString& key, long *pl, long defVal) const;
 
   bool Read(const wxString& key, long *pl) const;
   bool Read(const wxString& key, long *pl, long defVal) const;
 

-    // read an int
+    // read an int (wrapper around `long' version)

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


@@ -178,48 +178,130 @@ public:
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;
 
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;
 

+#if wxUSE_BASE64

     // read a binary data block
   bool Read(const wxString& key, wxMemoryBuffer* data) const
     // read a binary data block
   bool Read(const wxString& key, wxMemoryBuffer* data) const

-   { return DoReadBinary(key, data); }
+    { return DoReadBinary(key, data); }

    // no default version since it does not make sense for binary data
    // no default version since it does not make sense for binary data

+#endif // wxUSE_BASE64

 
 

-  // convenience functions returning directly the value (we don't have them for
-  // int/double/bool as there would be ambiguities with the long one then)
+  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
+  // read other types, for which wxFromString is defined
+  template <typename T>
+  bool Read(const wxString& key, T* value) const
+  {
+      wxString s;
+      if ( !Read(key, &s) )
+          return false;
+      return wxFromString(s, value);
+  }
+
+  template <typename T>
+  bool Read(const wxString& key, T* value, const T& defVal) const
+  {
+      const bool found = Read(key, value);
+      if ( !found )
+      {
+          if (IsRecordingDefaults())
+              ((wxConfigBase *)this)->Write(key, defVal);
+          *value = defVal;
+      }
+      return found;
+  }
+#endif
+
+  // convenience functions returning directly the value 

   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }
 
   wxString Read(const wxString& key,
                 const wxString& defVal = wxEmptyString) const
     { wxString s; (void)Read(key, &s, defVal); return s; }
 

-  long Read(const wxString& key, long defVal) const
+  // we have to provide a separate version for C strings as otherwise the
+  // template Read() would be used
+  wxString Read(const wxString& key, const char* defVal) const
+    { return Read(key, wxString(defVal)); }
+#if wxUSE_WCHAR_T
+  wxString Read(const wxString& key, const wchar_t* defVal) const
+    { return Read(key, wxString(defVal)); }
+#endif
+
+  long ReadLong(const wxString& key, long defVal) const

     { long l; (void)Read(key, &l, defVal); return l; }
 
     { long l; (void)Read(key, &l, defVal); return l; }
 

-    // write the value (return true on success)
+  double ReadDouble(const wxString& key, double defVal) const
+    { double d; (void)Read(key, &d, defVal); return d; }
+
+  bool ReadBool(const wxString& key, bool defVal) const
+    { bool b; (void)Read(key, &b, defVal); return b; }
+
+  template <typename T>
+  T ReadObject(const wxString& key, T const& defVal) const
+    { T t; (void)Read(key, &t, defVal); return t; }
+
+  // for compatibility with wx 2.8
+  long Read(const wxString& key, long defVal) const
+    { return ReadLong(key, defVal); }
+
+
+  // write the value (return true on success)

   bool Write(const wxString& key, const wxString& value)
     { return DoWriteString(key, value); }
 
   bool Write(const wxString& key, long value)
     { return DoWriteLong(key, value); }
 
   bool Write(const wxString& key, const wxString& value)
     { return DoWriteString(key, value); }
 
   bool Write(const wxString& key, long value)
     { return DoWriteLong(key, value); }
 

-  bool Write(const wxString& key, int value)
-    { return DoWriteInt(key, value); }
-

   bool Write(const wxString& key, double value)
     { return DoWriteDouble(key, value); }
 
   bool Write(const wxString& key, bool value)
     { return DoWriteBool(key, value); }
 
   bool Write(const wxString& key, double value)
     { return DoWriteDouble(key, value); }
 
   bool Write(const wxString& key, bool value)
     { return DoWriteBool(key, value); }
 

+#if wxUSE_BASE64

   bool Write(const wxString& key, const wxMemoryBuffer& buf)
     { return DoWriteBinary(key, buf); }
   bool Write(const wxString& key, const wxMemoryBuffer& buf)
     { return DoWriteBinary(key, buf); }

+#endif // wxUSE_BASE64

 
   // we have to provide a separate version for C strings as otherwise they
   // would be converted to bool and not to wxString as expected!
   bool Write(const wxString& key, const char *value)
     { return Write(key, wxString(value)); }
 
   // we have to provide a separate version for C strings as otherwise they
   // would be converted to bool and not to wxString as expected!
   bool Write(const wxString& key, const char *value)
     { return Write(key, wxString(value)); }

+  bool Write(const wxString& key, const unsigned char *value)
+    { return Write(key, wxString(value)); }

 #if wxUSE_WCHAR_T
   bool Write(const wxString& key, const wchar_t *value)
     { return Write(key, wxString(value)); }
 #endif
 
 #if wxUSE_WCHAR_T
   bool Write(const wxString& key, const wchar_t *value)
     { return Write(key, wxString(value)); }
 #endif
 

+
+  // we also have to provide specializations for other types which we want to
+  // handle using the specialized DoWriteXXX() instead of the generic template
+  // version below
+  bool Write(const wxString& key, short value)
+    { return DoWriteLong(key, value); }
+
+  bool Write(const wxString& key, unsigned short value)
+    { return DoWriteLong(key, value); }
+
+  bool Write(const wxString& key, unsigned int value)
+    { return DoWriteLong(key, value); }
+
+  bool Write(const wxString& key, int value)
+    { return DoWriteLong(key, value); }
+
+  bool Write(const wxString& key, unsigned long value)
+    { return DoWriteLong(key, value); }
+
+  bool Write(const wxString& key, float value)
+    { return DoWriteDouble(key, value); }
+
+  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
+  // for other types, use wxToString()
+  template <typename T>
+  bool Write(const wxString& key, T const& value)
+    { return Write(key, wxToString(value)); }
+#endif
+

   // permanently writes all changes
   virtual bool Flush(bool bCurrentOnly = false) = 0;
 
   // permanently writes all changes
   virtual bool Flush(bool bCurrentOnly = false) = 0;
 


@@ -279,17 +361,19 @@ protected:
   // do read/write the values of different types
   virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
   virtual bool DoReadLong(const wxString& key, long *pl) const = 0;
   // do read/write the values of different types
   virtual bool DoReadString(const wxString& key, wxString *pStr) const = 0;
   virtual bool DoReadLong(const wxString& key, long *pl) const = 0;

-  virtual bool DoReadInt(const wxString& key, int *pi) const;

   virtual bool DoReadDouble(const wxString& key, double* val) const;
   virtual bool DoReadBool(const wxString& key, bool* val) const;
   virtual bool DoReadDouble(const wxString& key, double* val) const;
   virtual bool DoReadBool(const wxString& key, bool* val) const;

+#if wxUSE_BASE64

   virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const = 0;
   virtual bool DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const = 0;

+#endif // wxUSE_BASE64

 
   virtual bool DoWriteString(const wxString& key, const wxString& value) = 0;
   virtual bool DoWriteLong(const wxString& key, long value) = 0;
 
   virtual bool DoWriteString(const wxString& key, const wxString& value) = 0;
   virtual bool DoWriteLong(const wxString& key, long value) = 0;

-  virtual bool DoWriteInt(const wxString& key, int value);

   virtual bool DoWriteDouble(const wxString& key, double value);
   virtual bool DoWriteBool(const wxString& key, bool value);
   virtual bool DoWriteDouble(const wxString& key, double value);
   virtual bool DoWriteBool(const wxString& key, bool value);

+#if wxUSE_BASE64

   virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) = 0;
   virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf) = 0;

+#endif // wxUSE_BASE64

 
 private:
   // are we doing automatic environment variable expansion?
 
 private:
   // are we doing automatic environment variable expansion?