compilation fixes for wxGTK1 after wxTextEntry changes (unit test still fails, Replac...

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 9d97e49680dd42d34133e322656f33b977d0e13b..4f74387ff566eff32ee10a0fecf0f071cbed1e8c 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -185,8 +185,8 @@ public:
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 
-  // Causes ambiguities in VC++ 6 (at least)
-#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
+  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const
@@ -211,8 +211,7 @@ public:
   }
 #endif
 
-  // 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)
+  // 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; }
@@ -226,10 +225,25 @@ public:
     { return Read(key, wxString(defVal)); }
 #endif
 
-  long Read(const wxString& key, long defVal) const
+  long ReadLong(const wxString& key, long defVal) const
     { 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); }
 
@@ -280,8 +294,8 @@ public:
   bool Write(const wxString& key, float value)
     { return DoWriteDouble(key, value); }
 
-  // Causes ambiguities in VC++ 6 (at least)
-#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
+  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
+#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
   // for other types, use wxToString()
   template <typename T>
   bool Write(const wxString& key, T const& value)