Fix compilation under MSW with GCC cross.

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

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 8936454dfe22886d4e19cedaf0c443d4346436d7..97b58b24978caac758169ae86121c5ffc6398d56 100644 (file)
--- a/src/common/strconv.cpp
+++ b/src/common/strconv.cpp
@@ -2229,11 +2229,11 @@ private:
             int verMaj, verMin;
             switch ( wxGetOsVersion(&verMaj, &verMin) )
             {
             int verMaj, verMin;
             switch ( wxGetOsVersion(&verMaj, &verMin) )
             {

-                case wxWIN95:
+                case wxOS_WINDOWS_9X:

                     s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
                     break;
 
                     s_isWin98Or2k = verMaj >= 4 && verMin >= 10;
                     break;
 

-                case wxWINDOWS_NT:
+                case wxOS_WINDOWS_NT:

                     s_isWin98Or2k = verMaj >= 5;
                     break;
 
                     s_isWin98Or2k = verMaj >= 5;
                     break;
 


@@ -3339,20 +3339,26 @@ wxMBConv *wxCSConv::DoCreate() const
             }
 
             const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
             }
 
             const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);

-
-            for ( ; *names; ++names )
+            // CS : in case this does not return valid names (eg for MacRoman) encoding
+            // got a 'failure' entry in the cache all the same, although it just has to 
+            // be created using a different method, so only store failed iconv creation
+            // attempts (or perhaps we shoulnd't do this at all ?)
+            if ( names[0] != NULL )

             {
             {

-                wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
-                if ( conv->IsOk() )
+                for ( ; *names; ++names )

                 {
                 {

-                    gs_nameCache[encoding] = *names;
-                    return conv;
+                    wxMBConv_iconv *conv = new wxMBConv_iconv(*names);
+                    if ( conv->IsOk() )
+                    {
+                        gs_nameCache[encoding] = *names;
+                        return conv;
+                    }
+
+                    delete conv;

                 }
 
                 }
 

-                delete conv;
+                gs_nameCache[encoding] = _T(""); // cache the failure

             }
             }

-
-            gs_nameCache[encoding] = _T(""); // cache the failure

         }
 #endif // wxUSE_FONTMAP
     }
         }
 #endif // wxUSE_FONTMAP
     }