fixes for Sun CC 5.0 (unlike 4.2 it understands bool)

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 7cc1d07729542f3d86f91083328b8a2f2eaf73e1..36a9d05efe07985b4536d987cbd6f3cbf4a6f806 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -18,14 +18,11 @@
 #pragma interface "confbase.h"
 #endif
 
 #pragma interface "confbase.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#include "wx/defs.h"
+
+#ifdef wxUSE_CONFIG

 
 

-// it won't compile without it anyhow
-#ifndef USE_CONFIG
-  #error "Please define USE_CONFIG or remove config.cpp from your makefile"
-#endif // USE_CONFIG
+#include "wx/string.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -76,7 +73,7 @@ extern wxString wxExpandEnvVars(const wxString &sz);
 extern void wxSplitPath(wxArrayString& aParts, const char *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
 // 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).
 // ----------------------------------------------------------------------------
 // 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
 {
 public:
   // static functions


@@ -164,6 +161,11 @@ public:
     { long l; Read(strKey, &l, defVal); return l; }
 
   // Convenience functions that are built on other forms
     { long l; Read(strKey, &l, defVal); return l; }
 
   // Convenience functions that are built on other forms

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

   // double
   virtual bool Read(const wxString& key, double* val) const;
   virtual bool Read(const wxString& key, double* val, double defVal) const;
   // double
   virtual bool Read(const wxString& key, double* val) const;
   virtual bool Read(const wxString& key, double* val, double defVal) const;


@@ -203,15 +205,7 @@ public:
   void SetRecordDefaults(bool bDoIt = TRUE) { m_bRecordDefaults = bDoIt; }
   bool IsRecordingDefaults() const { return m_bRecordDefaults; }
   // does expansion only if needed
   void SetRecordDefaults(bool bDoIt = TRUE) { m_bRecordDefaults = bDoIt; }
   bool IsRecordingDefaults() const { return m_bRecordDefaults; }
   // does expansion only if needed

-  wxString ExpandEnvVars(const wxString& str) const
-    {
-        wxString tmp; // Required for BC++
-        if (IsExpandingEnvVars())
-            tmp = wxExpandEnvVars(str);
-        else
-            tmp = str;
-        return tmp;
-    }
+  wxString ExpandEnvVars(const wxString& str) const;

 
     // misc accessors
   inline wxString GetAppName() const { return m_appName; }
 
     // misc accessors
   inline wxString GetAppName() const { return m_appName; }


@@ -225,14 +219,18 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
 
 protected:
   static bool IsImmutable(const wxString& key)

-    { return key[0] == 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;
 
 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;
   // static variables
   static wxConfigBase *ms_pConfig;
   static bool          ms_bAutoCreate;


@@ -286,7 +284,10 @@ private:
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 
   #define sm_classwxConfig sm_classwxFileConfig
 #endif
 

+#endif 
+ 
+  // wxUSE_CONFIG

 
 

-
-#endif  // _WX_CONFIG_H_
+#endif
+  // _WX_CONFIG_H_