More progress on wxMotif, incl. wxTreeCtrl/wxListCtrl beginning to work

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index af05537a6ce793f02600a247932b10709b8a2354..1b51cae5265fde8163ec58c77d2cf3b2ef1f3f8e 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -164,6 +164,11 @@ public:
     { 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;
@@ -203,15 +208,7 @@ public:
   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; }
@@ -225,7 +222,7 @@ public:
 
 protected:
   static bool IsImmutable(const wxString& key)
-    { return key[0] == wxCONFIG_IMMUTABLE_PREFIX; }
+    { return key[0u] == wxCONFIG_IMMUTABLE_PREFIX; }
 
 private:
   // are we doing automatic environment variable expansion?