Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/config.cpp b/src/common/config.cpp
index a0c3a75738bb00bdeef6e92426e53ca7c90f0368..8be69dc19455191e2db761fbc902bb842f8839f9 100644 (file)
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -293,24 +293,25 @@ wxConfigPathChanger::~wxConfigPathChanger()
 // understands both Unix and Windows (but only under Windows) environment
 // variables expansion: i.e. $var, $(var) and ${var} are always understood
 // and in addition under Windows %var% is also.
+
+// don't change the values the enum elements: they must be equal
+// to the matching [closing] delimiter.
+enum Bracket
+{
+  Bracket_None,
+  Bracket_Normal  = ')',
+  Bracket_Curly   = '}',
+#ifdef  __WXMSW__
+  Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
+#endif
+  Bracket_Max
+};
+
 wxString wxExpandEnvVars(const wxString& str)
 {
   wxString strResult;
   strResult.Alloc(str.Len());
 
-  // don't change the values the enum elements: they must be equal
-  // to the matching [closing] delimiter.
-  enum Bracket
-  {
-    Bracket_None,
-    Bracket_Normal  = ')',
-    Bracket_Curly   = '}',
-#ifdef  __WXMSW__
-    Bracket_Windows = '%',    // yeah, Windows people are a bit strange ;-)
-#endif
-    Bracket_Max
-  };
-
   size_t m;
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {
@@ -380,8 +381,8 @@ wxString wxExpandEnvVars(const wxString& str)
               // under Unix, OTOH, this warning could be useful for the user to
               // understand why isn't the variable expanded as intended
               #ifndef __WXMSW__
-                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %d in '%s'."),
-                             (char)bracket, m + 1, str.c_str());
+                wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."),
+                             (char)bracket, (unsigned int) (m + 1), str.c_str());
               #endif // __WXMSW__
             }
             else {