Force wide char environment version initialization in wxGetEnvMap().

[wxWidgets.git] / include / wx / arrimpl.cpp

diff --git a/include/wx/arrimpl.cpp b/include/wx/arrimpl.cpp
index e2f4dee76b5c43826689ab056410fb061b8832ae..f2bc7ce73f96540eeb39e244210b5ef8512501e6 100644 (file)
--- a/include/wx/arrimpl.cpp
+++ b/include/wx/arrimpl.cpp
@@ -6,7 +6,7 @@
 // Created:     16.10.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     16.10.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWidgets license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 /*****************************************************************************
 ///////////////////////////////////////////////////////////////////////////////
 
 /*****************************************************************************


@@ -98,7 +98,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
       size_t ui = size() - 1;                                                 \
       do {                                                                    \
         if ( (T*)base_array::operator[](ui) == &Item )                        \
       size_t ui = size() - 1;                                                 \
       do {                                                                    \
         if ( (T*)base_array::operator[](ui) == &Item )                        \

-          return ui;                                                          \
+          return static_cast<int>(ui);                                     \

         ui--;                                                                 \
       }                                                                       \
       while ( ui != 0 );                                                      \
         ui--;                                                                 \
       }                                                                       \
       while ( ui != 0 );                                                      \


@@ -107,7 +107,7 @@ int name::Index(const T& Item, bool bFromEnd) const                           \
   else {                                                                      \
     for( size_t ui = 0; ui < size(); ui++ ) {                                 \
       if( (T*)base_array::operator[](ui) == &Item )                           \
   else {                                                                      \
     for( size_t ui = 0; ui < size(); ui++ ) {                                 \
       if( (T*)base_array::operator[](ui) == &Item )                           \

-        return ui;                                                            \
+        return static_cast<int>(ui);                                       \

     }                                                                         \
   }                                                                           \
                                                                               \
     }                                                                         \
   }                                                                           \
                                                                               \