[Wxdevcenter-cvs] StdPlugin/src SimpleTextDocView.cpp,1.6,1.7

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24897/src

Modified Files:
	SimpleTextDocView.cpp 
Log Message:
Suite du transfert de la conf des textes vers les fichiers .conf

Index: SimpleTextDocView.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SimpleTextDocView.cpp	16 Feb 2005 15:10:02 -0000	1.6
--- SimpleTextDocView.cpp	16 Feb 2005 17:45:56 -0000	1.7
***************
*** 82,219 ****
  
  
- static wxString s_LangageName[WXDC_NB_LEX] =
- {
- WXDC_LEXNAME_CONTAINER ,
- WXDC_LEXNAME_NULL      ,
- WXDC_LEXNAME_PYTHON    ,
- WXDC_LEXNAME_CPP       ,
- WXDC_LEXNAME_HTML      ,
- WXDC_LEXNAME_XML       ,
- WXDC_LEXNAME_PERL      ,
- WXDC_LEXNAME_SQL       ,
- WXDC_LEXNAME_VB        ,
- WXDC_LEXNAME_PROPERTIES,
- WXDC_LEXNAME_ERRORLIST ,
- WXDC_LEXNAME_MAKEFILE  ,
- WXDC_LEXNAME_BATCH     ,
- WXDC_LEXNAME_XCODE     ,
- WXDC_LEXNAME_LATEX     ,
- WXDC_LEXNAME_LUA       ,
- WXDC_LEXNAME_DIFF      ,
- WXDC_LEXNAME_CONF      ,
- WXDC_LEXNAME_PASCAL    ,
- WXDC_LEXNAME_AVE       ,
- WXDC_LEXNAME_ADA       ,
- WXDC_LEXNAME_LISP      ,
- WXDC_LEXNAME_RUBY      ,
- WXDC_LEXNAME_EIFFEL    ,
- WXDC_LEXNAME_EIFFELKW  ,
- WXDC_LEXNAME_TCL       ,
- WXDC_LEXNAME_NNCRONTAB ,
- WXDC_LEXNAME_BULLANT   ,
- WXDC_LEXNAME_VBSCRIPT  ,
- WXDC_LEXNAME_ASP       ,
- WXDC_LEXNAME_PHP       ,
- WXDC_LEXNAME_BAAN      ,
- WXDC_LEXNAME_MATLAB    ,
- WXDC_LEXNAME_SCRIPTOL  ,
- WXDC_LEXNAME_ASM       ,
- WXDC_LEXNAME_CPPNOCASE ,
- WXDC_LEXNAME_FORTRAN   ,
- WXDC_LEXNAME_F77       ,
- WXDC_LEXNAME_CSS       ,
- WXDC_LEXNAME_POV       ,
- WXDC_LEXNAME_LOUT      ,
- WXDC_LEXNAME_ESCRIPT   ,
- WXDC_LEXNAME_PS        ,
- WXDC_LEXNAME_NSIS      ,
- WXDC_LEXNAME_MMIXAL    ,
- WXDC_LEXNAME_CLW       ,
- WXDC_LEXNAME_CLWNOCASE ,
- WXDC_LEXNAME_LOT       ,
- WXDC_LEXNAME_YAML      ,
- WXDC_LEXNAME_TEX       ,
- WXDC_LEXNAME_METAPOST  ,
- WXDC_LEXNAME_POWERBASIC,
- WXDC_LEXNAME_FORTH     ,
- WXDC_LEXNAME_ERLANG    ,
- WXDC_LEXNAME_OCTAVE    ,
- WXDC_LEXNAME_MSSQL     ,
- WXDC_LEXNAME_VERILOG   ,
- WXDC_LEXNAME_KIX       ,
- WXDC_LEXNAME_GUI4CLI   ,
- WXDC_LEXNAME_SPECMAN   ,
- WXDC_LEXNAME_AU3       ,
- WXDC_LEXNAME_APDL      ,
- WXDC_LEXNAME_BASH      
- };
- 
- static wxString s_LangageShortName[WXDC_NB_LEX] =
- {
- WXDC_LEXSHORTNAME_CONTAINER ,
- WXDC_LEXSHORTNAME_NULL      ,
- WXDC_LEXSHORTNAME_PYTHON    ,
- WXDC_LEXSHORTNAME_CPP       ,
- WXDC_LEXSHORTNAME_HTML      ,
- WXDC_LEXSHORTNAME_XML       ,
- WXDC_LEXSHORTNAME_PERL      ,
- WXDC_LEXSHORTNAME_SQL       ,
- WXDC_LEXSHORTNAME_VB        ,
- WXDC_LEXSHORTNAME_PROPERTIES,
- WXDC_LEXSHORTNAME_ERRORLIST ,
- WXDC_LEXSHORTNAME_MAKEFILE  ,
- WXDC_LEXSHORTNAME_BATCH     ,
- WXDC_LEXSHORTNAME_XCODE     ,
- WXDC_LEXSHORTNAME_LATEX     ,
- WXDC_LEXSHORTNAME_LUA       ,
- WXDC_LEXSHORTNAME_DIFF      ,
- WXDC_LEXSHORTNAME_CONF      ,
- WXDC_LEXSHORTNAME_PASCAL    ,
- WXDC_LEXSHORTNAME_AVE       ,
- WXDC_LEXSHORTNAME_ADA       ,
- WXDC_LEXSHORTNAME_LISP      ,
- WXDC_LEXSHORTNAME_RUBY      ,
- WXDC_LEXSHORTNAME_EIFFEL    ,
- WXDC_LEXSHORTNAME_EIFFELKW  ,
- WXDC_LEXSHORTNAME_TCL       ,
- WXDC_LEXSHORTNAME_NNCRONTAB ,
- WXDC_LEXSHORTNAME_BULLANT   ,
- WXDC_LEXSHORTNAME_VBSCRIPT  ,
- WXDC_LEXSHORTNAME_ASP       ,
- WXDC_LEXSHORTNAME_PHP       ,
- WXDC_LEXSHORTNAME_BAAN      ,
- WXDC_LEXSHORTNAME_MATLAB    ,
- WXDC_LEXSHORTNAME_SCRIPTOL  ,
- WXDC_LEXSHORTNAME_ASM       ,
- WXDC_LEXSHORTNAME_CPPNOCASE ,
- WXDC_LEXSHORTNAME_FORTRAN   ,
- WXDC_LEXSHORTNAME_F77       ,
- WXDC_LEXSHORTNAME_CSS       ,
- WXDC_LEXSHORTNAME_POV       ,
- WXDC_LEXSHORTNAME_LOUT      ,
- WXDC_LEXSHORTNAME_ESCRIPT   ,
- WXDC_LEXSHORTNAME_PS        ,
- WXDC_LEXSHORTNAME_NSIS      ,
- WXDC_LEXSHORTNAME_MMIXAL    ,
- WXDC_LEXSHORTNAME_CLW       ,
- WXDC_LEXSHORTNAME_CLWNOCASE ,
- WXDC_LEXSHORTNAME_LOT       ,
- WXDC_LEXSHORTNAME_YAML      ,
- WXDC_LEXSHORTNAME_TEX       ,
- WXDC_LEXSHORTNAME_METAPOST  ,
- WXDC_LEXSHORTNAME_POWERBASIC,
- WXDC_LEXSHORTNAME_FORTH     ,
- WXDC_LEXSHORTNAME_ERLANG    ,
- WXDC_LEXSHORTNAME_OCTAVE    ,
- WXDC_LEXSHORTNAME_MSSQL     ,
- WXDC_LEXSHORTNAME_VERILOG   ,
- WXDC_LEXSHORTNAME_KIX       ,
- WXDC_LEXSHORTNAME_GUI4CLI   ,
- WXDC_LEXSHORTNAME_SPECMAN   ,
- WXDC_LEXSHORTNAME_AU3       ,
- WXDC_LEXSHORTNAME_APDL      ,
- WXDC_LEXSHORTNAME_BASH      
- };
- 
  
  /** Traduction d'une couleur vers sa forme de sauvegarde de config.
--- 82,85 ----
***************
*** 225,229 ****
      wxString str = wxTheColourDatabase->FindName(col);
      if(str.IsEmpty())
!         str.Printf(wxT("#%02d%02d%02d"), col.Red(), col.Green(), col.Blue());
      return str;
  }
--- 91,95 ----
      wxString str = wxTheColourDatabase->FindName(col);
      if(str.IsEmpty())
!         str.Printf(wxT("#%02hX%02hX%02hX"), (unsigned short)col.Red(), (unsigned short)col.Green(), (unsigned short)col.Blue());
      return str;
  }
***************
*** 292,297 ****
      LanguageProperty::LangagePropertyStyle* pCurStyle;
  
-     InitPreferences();
- 
      wxConfigBase& GlobalConfig = wxGetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT];
      GlobalConfig.SetPath(wxT("/"));
--- 158,161 ----
***************
*** 307,312 ****
  
          Config.SetPath(wxT("/"));
-         pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds);
          pLang->strName = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName);
  
          for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++)
--- 171,178 ----
  
          Config.SetPath(wxT("/"));
          pLang->strName = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName);
+         pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds);
+         
+         wxLogDebug("Lang %02d : %s - %s", iLang, pLang->strShortName, pLang->strName);
  
          for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++)
***************
*** 356,361 ****
  
          Config.SetPath(wxT("/"));
-         Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds);
          Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName);
  
          for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++)
--- 222,227 ----
  
          Config.SetPath(wxT("/"));
          Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName);
+         Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds);
  
          for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++)
***************
*** 390,540 ****
  
  
- void InitPreferences()
- {
-     for(int i=0; i<WXDC_NB_LEX; i++)
-     {
-         g_LangagePropertyArray[i].strName = s_LangageName[i];
-         g_LangagePropertyArray[i].strShortName = s_LangageShortName[i];
-     }
- 
- 
-      LanguageProperty *pLang;
-     
-     /** Texte simple.*/
-     pLang = &g_LangagePropertyArray[wxSTC_LEX_CPP];
-     pLang->Styles[0].bUsed = true;
-     pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_TEXT_DEFAULT;
- 
-     /** Langage C++. Basé sur la configuration donnée dans cpp.properties de SciTE.*/
-     pLang->Styles[wxSTC_C_STRING].iFontStyle = WXDC_STC_STYLE_ITALIC;
-     pLang->Styles[wxSTC_C_CHARACTER].iFontStyle = WXDC_STC_STYLE_ITALIC;
-     pLang->Styles[wxSTC_C_PREPROCESSOR].iFontStyle = WXDC_STC_STYLE_BOLD;
-     pLang->Styles[wxSTC_C_COMMENT].colForeground = wxColor("FOREST GREEN");     
-     pLang->Styles[wxSTC_C_COMMENTLINE].colForeground = wxColor("FOREST GREEN"); 
-     pLang->Styles[wxSTC_C_COMMENTDOC].colForeground = wxColor("FOREST GREEN");  
-     pLang->Styles[wxSTC_C_NUMBER].colForeground = wxColor("VIOLET");            
-     pLang->Styles[wxSTC_C_WORD].colForeground = wxColor("BLUE");                
-     pLang->Styles[wxSTC_C_STRING].colForeground = wxColor("VIOLET");            
-     pLang->Styles[wxSTC_C_CHARACTER].colForeground = wxColor("VIOLET");         
-     pLang->Styles[wxSTC_C_UUID].colForeground = wxColor("BLUE");                
-     pLang->Styles[wxSTC_C_PREPROCESSOR].colForeground = wxColor("BLUE");        
-     pLang->Styles[wxSTC_C_STRINGEOL].colForeground = wxColor("VIOLET");         
-     pLang->Styles[wxSTC_C_REGEX].colForeground = wxColor("BLUE");               
-     pLang->Styles[wxSTC_C_COMMENTLINEDOC].colBackground = wxColor("GREEN");     
-     pLang->Styles[wxSTC_C_WORD2].colForeground = wxColor("BLUE");               
-     pLang->Styles[wxSTC_C_COMMENTDOCKEYWORD].colForeground = wxColor("FIREBRICK");
-     pLang->Styles[wxSTC_C_COMMENTDOCKEYWORDERROR].colForeground = wxColor("RED");
-     pLang->Styles[wxSTC_C_GLOBALCLASS].colForeground = wxColor("BLUE");
-     /** Style des folds.*/
-     pLang->iFolds = WXDC_STC_FOLD_COMMENT | WXDC_STC_FOLD_COMPACT | WXDC_STC_FOLD_PREPROC;
-     /** Lexemes.*/
-     pLang->Keywords[0].strKeys = _T("asm auto bool break case catch char class const const_cast \
-        continue default delete do double dynamic_cast else enum explicit \
-        export extern false float for friend goto if inline int long \
-        mutable namespace new operator private protected public register \
-        reinterpret_cast return short signed sizeof static static_cast \
-        struct switch template this throw true try typedef typeid \
-        typename union unsigned using virtual void volatile wchar_t \
-        while");
-     pLang->Keywords[2].strKeys = _T("file class");
-     pLang->Keywords[3].strKeys = _T("a addindex addtogroup anchor arg attention author b brief bug c \
-        class code date def defgroup deprecated dontinclude e em endcode \
-        endhtmlonly endif endlatexonly endlink endverbatim enum example \
-        exception f$ f[ f] file fn hideinitializer htmlinclude \
-        htmlonly if image include ingroup internal invariant interface \
-        latexonly li line link mainpage name namespace nosubgrouping note \
-        overload p page par param post pre ref relates remarks return \
-        retval sa section see showinitializer since skip skipline struct \
-        subsection test throw todo typedef union until var verbatim \
-        verbinclude version warning weakgroup $ @ "" & < > # { }");
-     for(int i=0; i<=20; i++)
-         pLang->Styles[i].bUsed = true;
-     pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_C_DEFAULT;
-     pLang->Styles[1].strLabel = WXDC_SIMPLETEXT_C_COMMENT;
-     pLang->Styles[2].strLabel = WXDC_SIMPLETEXT_C_COMMENTLINE;
-     pLang->Styles[3].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOC;
-     pLang->Styles[4].strLabel = WXDC_SIMPLETEXT_C_NUMBER;
-     pLang->Styles[6].strLabel = WXDC_SIMPLETEXT_C_WORD;
-     pLang->Styles[7].strLabel = WXDC_SIMPLETEXT_C_STRING;
-     pLang->Styles[8].strLabel = WXDC_SIMPLETEXT_C_CHARACTER;
-     pLang->Styles[9].strLabel = WXDC_SIMPLETEXT_C_UUID;
-     pLang->Styles[10].strLabel = WXDC_SIMPLETEXT_C_PREPROC;
-     pLang->Styles[11].strLabel = WXDC_SIMPLETEXT_C_OPERATOR;
-     pLang->Styles[12].strLabel = WXDC_SIMPLETEXT_C_IDENTIFIER;
-     pLang->Styles[13].strLabel = WXDC_SIMPLETEXT_C_STRINGEOL;
-     pLang->Styles[14].strLabel = WXDC_SIMPLETEXT_C_NOTUSED;
-     pLang->Styles[15].strLabel = WXDC_SIMPLETEXT_C_REGEXP;
-     pLang->Styles[16].strLabel = WXDC_SIMPLETEXT_C_COMMENTLINEDOC;
-     pLang->Styles[17].strLabel = WXDC_SIMPLETEXT_C_WORD2;
-     pLang->Styles[18].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOCKEYWORD;
-     pLang->Styles[19].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOCKEYWORDERROR;
-     pLang->Styles[20].strLabel = WXDC_SIMPLETEXT_C_GLOBALCLASS;
- 
- 
-     /** Langage LUA. Basé sur la configuration donnée dans cpp.properties de SciTE.*/
-     pLang = &g_LangagePropertyArray[wxSTC_LEX_LUA];
-     /** Style.*/
-     pLang->Styles[wxSTC_LUA_DEFAULT].colForeground = wxColor("BLACK");
-     pLang->Styles[wxSTC_LUA_COMMENT].colForeground = wxColor("FOREST GREEN");
-     pLang->Styles[wxSTC_LUA_COMMENTLINE].colForeground = wxColor("FOREST GREEN");
-     pLang->Styles[wxSTC_LUA_COMMENTDOC].colForeground = wxColor("FOREST GREEN");
-     pLang->Styles[wxSTC_LUA_NUMBER].colForeground = wxColor("VIOLET");
-     pLang->Styles[wxSTC_LUA_WORD].colForeground = wxColor("BLUE");
-     pLang->Styles[wxSTC_LUA_STRING].colForeground = wxColor("VIOLET");
-     pLang->Styles[wxSTC_LUA_CHARACTER].colForeground = wxColor("VIOLET");
-     pLang->Styles[wxSTC_LUA_LITERALSTRING].colForeground = wxColor("VIOLET");
-     pLang->Styles[wxSTC_LUA_PREPROCESSOR].colForeground = wxColor("BLUE");
-     pLang->Styles[wxSTC_LUA_OPERATOR].colForeground = wxColor("BLACK");
-    pLang->Styles[wxSTC_LUA_IDENTIFIER].colForeground = wxColor("BLACK");
-     pLang->Styles[wxSTC_LUA_STRINGEOL].colForeground = wxColor("VIOLET");
-     /** Style des folds.*/
-     pLang->iFolds = WXDC_STC_FOLD_COMMENT | WXDC_STC_FOLD_COMPACT | WXDC_STC_FOLD_PREPROC;
-     /** Lexemes.*/
-     pLang->Keywords[0].strKeys = _T("and break do else elseif end false for function if \
-         in local nil not or repeat return then true until while");
-     pLang->Keywords[1].strKeys = _T("_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring \
-         print tonumber tostring type unpack \
-         _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT \
-         _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype \
-         rawget rawset require sort tinsert tremove\
-         _G getfenv getmetatable ipairs loadlib next pairs pcall \
-         rawegal rawget rawset require setfenv setmetatable xpcall \
-         string table math coroutine io os debug");
-     pLang->Keywords[2].strKeys = _T("abs acos asin atan atan2 ceil cos deg exp \
-         floor format frexp gsub ldexp log log10 max min mod rad random randomseed \
-         sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan\
-         string.byte string.char string.dump string.find string.len \
-         string.lower string.rep string.sub string.upper string.format string.gfind string.gsub \
-         table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn \
-         math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp \
-         math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod \
-         math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan");
-     pLang->Keywords[3].strKeys = _T("openfile closefile readfrom writeto appendto \
-         remove rename flush seek tmpfile tmpname read write \
-         clock date difftime execute exit getenv setlocale time \
-         coroutine.create coroutine.resume coroutine.status \
-         coroutine.wrap coroutine.yield \
-         io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write \
-         io.stdin io.stdout io.stderr \
-         os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename \
-         os.setlocale os.time os.tmpname");
-     for(int i=0; i<=13; i++)
-         pLang->Styles[i].bUsed = true;
-     pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_LUA_DEFAULT;
-     pLang->Styles[1].strLabel = WXDC_SIMPLETEXT_LUA_COMMENT;
-     pLang->Styles[2].strLabel = WXDC_SIMPLETEXT_LUA_COMMENTLINE;
-     pLang->Styles[3].strLabel = WXDC_SIMPLETEXT_LUA_COMMENTDOC;
-     pLang->Styles[4].strLabel = WXDC_SIMPLETEXT_LUA_NUMBER;
-     pLang->Styles[6].strLabel = WXDC_SIMPLETEXT_LUA_WORD;
-     pLang->Styles[7].strLabel = WXDC_SIMPLETEXT_LUA_STRING;
-     pLang->Styles[8].strLabel = WXDC_SIMPLETEXT_LUA_CHARACTER;
-     pLang->Styles[9].strLabel = WXDC_SIMPLETEXT_LUA_LITERALSTRING;
-     pLang->Styles[10].strLabel = WXDC_SIMPLETEXT_LUA_PREPROCESSOR;
-     pLang->Styles[11].strLabel = WXDC_SIMPLETEXT_LUA_OPERATOR;
-     pLang->Styles[12].strLabel = WXDC_SIMPLETEXT_LUA_IDENTIFIER;
-     pLang->Styles[13].strLabel = WXDC_SIMPLETEXT_LUA_STRINGEOL;
- }
- 
- 
  void QueryPreferences()
  {
--- 256,259 ----
***************
*** 660,665 ****
  {
      m_pLanguage->Clear();
!     for(int i=0; i<WXDC_NB_LEX; i++)
!         m_pLanguage->Append(g_LangagePropertyArray[i].strName);
      if(!m_pLanguage->IsEmpty())
          m_pLanguage->SetSelection(0);
--- 379,384 ----
  {
      m_pLanguage->Clear();
!     for(int i=1; i<WXDC_NB_LEX; i++)
!         m_pLanguage->Append(g_LangagePropertyArray[i].strName, (void*)i);
      if(!m_pLanguage->IsEmpty())
          m_pLanguage->SetSelection(0);
***************
*** 700,704 ****
                  (pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)?wxBOLD:wxNORMAL,
                  (pCurStyle->iFontStyle&WXDC_STC_STYLE_UNDERL)!=0);
!     
      m_pCheckBold->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)!=0);
      m_pCheckItalic->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_ITALIC)!=0);
--- 419,425 ----
                  (pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)?wxBOLD:wxNORMAL,
                  (pCurStyle->iFontStyle&WXDC_STC_STYLE_UNDERL)!=0);
! 
!     m_pFontSize->SetValue(pCurStyle->iFontSize);
! 
      m_pCheckBold->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)!=0);
      m_pCheckItalic->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_ITALIC)!=0);
***************
*** 740,745 ****
  LanguageProperty* SimpleTextPrefDialog::GetCurrentLanguage()
  {
!     int iLang = m_pLanguage->GetSelection();
!     return (iLang!=wxNOT_FOUND)?&g_LangagePropertyArray[iLang]:NULL;
  }
  
--- 461,467 ----
  LanguageProperty* SimpleTextPrefDialog::GetCurrentLanguage()
  {
!     if(m_pLanguage->GetSelection()==wxNOT_FOUND)
!         return NULL;
!     return &g_LangagePropertyArray[(long)m_pLanguage->GetClientData(m_pLanguage->GetSelection())];
  }
  
***************
*** 793,796 ****
--- 515,521 ----
              pCurStyle->colBackground = col;
          break;
+     case ID_FONTSIZE:
+         pCurStyle->iFontSize = m_pFontSize->GetValue();
+         break;
      }
  
***************
*** 1025,1029 ****
      m_aMenu.Append(pMenu, WXDC_MENU_FIND);
      pMenu = new wxMenu();
!     for(int i=0; i<WXDC_NB_LEX; i++)
          pMenu->AppendCheckItem(IDM_LANG_START + i, g_LangagePropertyArray[i].strName);
      m_aMenu.Append(pMenu, WXDC_MENU_LANGUAGE);
--- 750,754 ----
      m_aMenu.Append(pMenu, WXDC_MENU_FIND);
      pMenu = new wxMenu();
!     for(int i=1; i<WXDC_NB_LEX; i++)
          pMenu->AppendCheckItem(IDM_LANG_START + i, g_LangagePropertyArray[i].strName);
      m_aMenu.Append(pMenu, WXDC_MENU_LANGUAGE);