Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 91871da380e1762fe05e7ca2d6ce2143cf6f920d..481723857e79354d8ab32c7bee0a54cc4e744c31 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        confbase.h
+// Name:        wx/confbase.h

 // Purpose:     declaration of the base class of all config implementations
 //              (see also: fileconf.h and msw/regconf.h and iniconf.h)
 // Author:      Karsten Ballueder & Vadim Zeitlin
 // Purpose:     declaration of the base class of all config implementations
 //              (see also: fileconf.h and msw/regconf.h and iniconf.h)
 // Author:      Karsten Ballueder & Vadim Zeitlin


@@ -32,19 +32,17 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 /// separates group and entry names (probably shouldn't be changed)
 #ifndef wxCONFIG_PATH_SEPARATOR
 
 /// separates group and entry names (probably shouldn't be changed)
 #ifndef wxCONFIG_PATH_SEPARATOR

-  #define   wxCONFIG_PATH_SEPARATOR     _T('/')
+  #define   wxCONFIG_PATH_SEPARATOR     wxT('/')

 #endif
 
 /// introduces immutable entries
 // (i.e. the ones which can't be changed from the local config file)
 #ifndef wxCONFIG_IMMUTABLE_PREFIX
 #endif
 
 /// introduces immutable entries
 // (i.e. the ones which can't be changed from the local config file)
 #ifndef wxCONFIG_IMMUTABLE_PREFIX

-  #define   wxCONFIG_IMMUTABLE_PREFIX   _T('!')
+  #define   wxCONFIG_IMMUTABLE_PREFIX   wxT('!')

 #endif
 
 #if wxUSE_CONFIG
 
 #endif
 
 #if wxUSE_CONFIG
 

-#include "wx/string.h"
-

 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))
 /// should we use registry instead of configuration files under Windows?
 // (i.e. whether wxConfigBase::Create() will create a wxFileConfig (if it's
 //  false) or wxRegConfig (if it's true and we're under Win32))


@@ -52,6 +50,15 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 
   #define wxUSE_CONFIG_NATIVE 1
 #endif
 

+// not all compilers can deal with template Read/Write() methods, define this
+// symbol if the template functions are available
+#if (!defined(__VISUALC__) || __VISUALC__ > 1200) && \
+    !defined( __VMS ) && \
+    !(defined(__HP_aCC) && defined(__hppa)) && \
+    !defined (__DMC__)
+    #define wxHAS_CONFIG_TEMPLATE_RW
+#endif
+

 // Style flags for constructor style parameter
 enum
 {
 // Style flags for constructor style parameter
 enum
 {


@@ -174,6 +181,10 @@ public:
   bool Read(const wxString& key, double* val) const;
   bool Read(const wxString& key, double* val, double defVal) const;
 
   bool Read(const wxString& key, double* val) const;
   bool Read(const wxString& key, double* val, double defVal) const;
 

+    // read a float
+  bool Read(const wxString& key, float* val) const;
+  bool Read(const wxString& key, float* val, float defVal) const;
+

     // read a bool
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;
     // read a bool
   bool Read(const wxString& key, bool* val) const;
   bool Read(const wxString& key, bool* val, bool defVal) const;


@@ -185,8 +196,7 @@ public:
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 
    // no default version since it does not make sense for binary data
 #endif // wxUSE_BASE64
 

-  // Causes ambiguities in VC++ 6 and OpenVMS (at least)
-#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) && !defined (__DMC__))
+#ifdef wxHAS_CONFIG_TEMPLATE_RW

   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const
   // read other types, for which wxFromString is defined
   template <typename T>
   bool Read(const wxString& key, T* value) const


@@ -209,9 +219,9 @@ public:
       }
       return found;
   }
       }
       return found;
   }

-#endif
+#endif // wxHAS_CONFIG_TEMPLATE_RW

 
 

-  // convenience functions returning directly the value 
+  // 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; }


@@ -220,10 +230,8 @@ public:
   // template Read() would be used
   wxString Read(const wxString& key, const char* defVal) const
     { return Read(key, wxString(defVal)); }
   // 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)); }
   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 ReadLong(const wxString& key, long defVal) const
     { long l; (void)Read(key, &l, defVal); return l; }


@@ -267,10 +275,8 @@ public:
     { return Write(key, wxString(value)); }
   bool Write(const wxString& key, const unsigned char *value)
     { return Write(key, wxString(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)); }
   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
 
 
   // we also have to provide specializations for other types which we want to


@@ -430,7 +436,7 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 

-  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
+  wxDECLARE_NO_COPY_CLASS(wxConfigPathChanger);

 };
 
 
 };