Headers moved a bit.

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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index 6ad12197a5c91d2875d17d4bb6e99569d5baa5f4..295cd6783a2a6f0455cc4606a434a341f3249f7e 100644 (file)
--- a/src/common/intl.cpp
+++ b/src/common/intl.cpp
@@ -310,7 +310,7 @@ bool wxMsgCatalog::Load(const wxChar *szDirPrefix, const wxChar *szName0)
    wxString szName = szName0;
    if(szName.Find('.') != -1) // contains a dot
       szName = szName.Left(szName.Find('.'));
-   
+
   // FIXME VZ: I forgot the exact meaning of LC_PATH - anyone to remind me?
   // KB: search path where to find the mo files, probably : delimited
 #if 0
@@ -418,7 +418,13 @@ const char *wxMsgCatalog::GetString(const char *szOrig) const
 
     size_t32 nIncr = 1 + (nHashVal % (m_nHashSize - 2));
 
-    while ( TRUE ) {
+#if defined(__VISAGECPP__)
+// VA just can't stand while(1) or while(TRUE)
+    bool bOs2var = TRUE;
+    while(bOs2var) {
+#else
+    while (1) {
+#endif
       size_t32 nStr = Swap(m_pHashTable[nIndex]);
       if ( nStr == 0 )
         return NULL;
@@ -586,12 +592,8 @@ const wxMB2WXbuf wxLocale::GetString(const wxChar *szOrigString,
   }
   else
   {
-    // FIXME it was
-    // return (wxMB2WXbuf)(wxConvCurrent->cMB2WX(pszTrans));
-    //       before, but we don't want to use wxConvCurrent explicitly to
-    //       avoid linking unnecessary code in ANSI programs without MB
-    //       support
-    return (wxMB2WXbuf)(pszTrans);
+    return wxConvertMB2WX(pszTrans); // or preferably wxCSConv(charset).cMB2WX(pszTrans) or something,
+                                     // a macro similar to wxConvertMB2WX could be written for that
   }
 
   #undef szOrgString