[Eliot-dev] eliot/wxwin auxframes.cc searchpanel.cc [multibyte]

[eliot-dev]

CVSROOT:        /sources/eliot
Module name:    eliot
Branch:         multibyte
Changes by:     Olivier Teulière <address@hidden>      05/12/29 19:40:24

Modified files:
        wxwin          : auxframes.cc searchpanel.cc 

Log message:
        Use wxString::wc_str() instead of wxString::c_str() to make it more 
clear
        that we use wode characters

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/wxwin/auxframes.cc.diff?only_with_tag=multibyte&tr1=1.19.2.2&tr2=1.19.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/eliot/eliot/wxwin/searchpanel.cc.diff?only_with_tag=multibyte&tr1=1.14.2.1&tr2=1.14.2.2&r1=text&r2=text

Patches:
Index: eliot/wxwin/auxframes.cc
diff -u eliot/wxwin/auxframes.cc:1.19.2.2 eliot/wxwin/auxframes.cc:1.19.2.3
--- eliot/wxwin/auxframes.cc:1.19.2.2   Thu Dec 29 19:36:55 2005
+++ eliot/wxwin/auxframes.cc    Thu Dec 29 19:40:24 2005
@@ -259,7 +259,7 @@
         result->SetLabel(wxT("pas de dictionnaire"));
         return;
     }
-    if (Dic_search_word(dic, word->GetValue().c_str()))
+    if (Dic_search_word(dic, word->GetValue().wc_str()))
         result->SetLabel(wxT("existe"));
     else
         result->SetLabel(wxT("n'existe pas"));
Index: eliot/wxwin/searchpanel.cc
diff -u eliot/wxwin/searchpanel.cc:1.14.2.1 eliot/wxwin/searchpanel.cc:1.14.2.2
--- eliot/wxwin/searchpanel.cc:1.14.2.1 Wed Dec 28 20:10:57 2005
+++ eliot/wxwin/searchpanel.cc  Thu Dec 29 19:40:24 2005
@@ -154,7 +154,7 @@
       return;
     }
 
-  wcsncpy(rack, t->GetValue().c_str(), DIC_WORD_MAX);
+  wcsncpy(rack, t->GetValue().wc_str(), DIC_WORD_MAX);
   Dic_search_Cros(dic,rack,buff);
 
   int resnum = 0;
@@ -198,7 +198,7 @@
       return;
     }
 
-  wcsncpy(rack, t->GetValue().c_str(), DIC_WORD_MAX);
+  wcsncpy(rack, t->GetValue().wc_str(), DIC_WORD_MAX);
   Dic_search_7pl1(dic,rack,buff,TRUE);
 
   int resnum = 0;
@@ -315,7 +315,7 @@
     return;
 
   build_letter_lists();
-  wcsncpy(re, t->GetValue().c_str(),DIC_RE_MAX);
+  wcsncpy(re, t->GetValue().wc_str(),DIC_RE_MAX);
   debug("PRegExp::compute_enter for %ls",re);
 
   int lmin = atoi((const char*)omin->GetValue().mb_str());