added an error message if a bitmap can't be addedto the image list

[wxWidgets.git] / src / common / config.cpp

diff --git a/src/common/config.cpp b/src/common/config.cpp
index 9707475ac918ca0d9dc4afee91c474cbc9376c66..47cf94f498f0856c203c6e6e7a86e3c4f6e8bc39 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -10,10 +10,6 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-// ============================================================================
-// declarations
-// ============================================================================
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -23,20 +19,22 @@
 
 #include  "wx/wxprec.h"
 
+#ifndef WX_PRECOMP
+#include  "wx/wx.h"
+#endif
+
+#include  <wx/confbase.h>
+
+#ifdef wxUSE_CONFIG
+
 #ifdef    __BORLANDC__
   #pragma hdrstop
 #endif  //__BORLANDC__
 
-#ifndef WX_PRECOMP
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-#endif //WX_PRECOMP
-
 #include  <wx/app.h>
 #include  <wx/file.h>
 #include  <wx/log.h>
 #include  <wx/textfile.h>
-#include  <wx/confbase.h>
 #include  <wx/utils.h>
 
 // we must include (one of) these files for wxConfigBase::Create
@@ -179,6 +177,24 @@ bool wxConfigBase::Read(const wxString& key, bool* val, bool defVal) const
 }
 
 // Convenience functions
+
+bool wxConfigBase::Read(const wxString& key, int *pi) const
+{
+    long l;
+    bool ret = Read(key, &l);
+    if (ret)
+        *pi = (int) l;
+    return ret;
+}
+
+bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const
+{
+    long l;
+    bool ret = Read(key, &l, (long) defVal);
+    *pi = (int) l;
+    return ret;
+}
+
 bool wxConfigBase::Write(const wxString& key, double val)
 {
     wxString str;
@@ -192,6 +208,15 @@ bool wxConfigBase::Write(const wxString& key, bool value)
     return Write(key, l);
 }
 
+wxString wxConfigBase::ExpandEnvVars(const wxString& str) const
+{
+    wxString tmp; // Required for BC++
+    if (IsExpandingEnvVars())
+        tmp = wxExpandEnvVars(str);
+    else
+        tmp = str;
+    return tmp;
+}
 
 // ----------------------------------------------------------------------------
 // wxConfigPathChanger
@@ -248,9 +273,9 @@ wxString wxExpandEnvVars(const wxString& str)
   {
     Bracket_None,
     Bracket_Normal  = ')',
-    Bracket_Curly   = '}',
+    Bracket_Curly   = '}'
 #ifdef  __WXMSW__
-    Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
+    ,Bracket_Windows = '%'     // yeah, Windows people are a bit strange ;-)
 #endif
   };
 
@@ -383,4 +408,7 @@ void wxSplitPath(wxArrayString& aParts, const char *sz)
   }
 }
 
+#endif
+
+  // wxUSE_CONFIG