From 88b98c53acd58f819968abe7a9fcc92fb4b28ac5 Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Thu, 20 Nov 2003 23:49:18 +0000 Subject: [PATCH] Applied patch #845884 (Fixes Unicode compilation of stc sample with Watcom). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/stc/prefs.cpp | 56 +++++++++++++++++------------------ samples/stc/prefs.cpp | 56 +++++++++++++++++------------------ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/contrib/samples/stc/prefs.cpp b/contrib/samples/stc/prefs.cpp index 7927082f75..2ef7735318 100644 --- a/contrib/samples/stc/prefs.cpp +++ b/contrib/samples/stc/prefs.cpp @@ -60,41 +60,41 @@ const CommonInfo g_CommonPrefs = { // keywordlists // C++ wxChar* CppWordlist1 = - _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"); + _T("asm auto bool break case catch char class const const_cast ") + _T("continue default delete do double dynamic_cast else enum explicit ") + _T("export extern false float for friend goto if inline int long ") + _T("mutable namespace new operator private protected public register ") + _T("reinterpret_cast return short signed sizeof static static_cast ") + _T("struct switch template this throw true try typedef typeid ") + _T("typename union unsigned using virtual void volatile wchar_t ") + _T("while"); wxChar* CppWordlist2 = _T("file"); wxChar* CppWordlist3 = - _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 $ @ "" & < > # { }"); + _T("a addindex addtogroup anchor arg attention author b brief bug c ") + _T("class code date def defgroup deprecated dontinclude e em endcode ") + _T("endhtmlonly endif endlatexonly endlink endverbatim enum example ") + _T("exception f$ f[ f] file fn hideinitializer htmlinclude ") + _T("htmlonly if image include ingroup internal invariant interface ") + _T("latexonly li line link mainpage name namespace nosubgrouping note ") + _T("overload p page par param post pre ref relates remarks return ") + _T("retval sa section see showinitializer since skip skipline struct ") + _T("subsection test throw todo typedef union until var verbatim ") + _T("verbinclude version warning weakgroup $ @ \"\" & < > # { }"); // Python wxChar* PythonWordlist1 = - _T("and assert break class continue def del elif else except exec \ - finally for from global if import in is lambda None not or pass \ - print raise return try while yield"); + _T("and assert break class continue def del elif else except exec ") + _T("finally for from global if import in is lambda None not or pass ") + _T("print raise return try while yield"); wxChar* PythonWordlist2 = - _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN \ - BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS \ - COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX \ - DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE \ - LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON \ - RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 \ - STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY"); + _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN ") + _T("BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS ") + _T("COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX ") + _T("DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE ") + _T("LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON ") + _T("RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 ") + _T("STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY"); //---------------------------------------------------------------------------- diff --git a/samples/stc/prefs.cpp b/samples/stc/prefs.cpp index 7927082f75..2ef7735318 100644 --- a/samples/stc/prefs.cpp +++ b/samples/stc/prefs.cpp @@ -60,41 +60,41 @@ const CommonInfo g_CommonPrefs = { // keywordlists // C++ wxChar* CppWordlist1 = - _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"); + _T("asm auto bool break case catch char class const const_cast ") + _T("continue default delete do double dynamic_cast else enum explicit ") + _T("export extern false float for friend goto if inline int long ") + _T("mutable namespace new operator private protected public register ") + _T("reinterpret_cast return short signed sizeof static static_cast ") + _T("struct switch template this throw true try typedef typeid ") + _T("typename union unsigned using virtual void volatile wchar_t ") + _T("while"); wxChar* CppWordlist2 = _T("file"); wxChar* CppWordlist3 = - _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 $ @ "" & < > # { }"); + _T("a addindex addtogroup anchor arg attention author b brief bug c ") + _T("class code date def defgroup deprecated dontinclude e em endcode ") + _T("endhtmlonly endif endlatexonly endlink endverbatim enum example ") + _T("exception f$ f[ f] file fn hideinitializer htmlinclude ") + _T("htmlonly if image include ingroup internal invariant interface ") + _T("latexonly li line link mainpage name namespace nosubgrouping note ") + _T("overload p page par param post pre ref relates remarks return ") + _T("retval sa section see showinitializer since skip skipline struct ") + _T("subsection test throw todo typedef union until var verbatim ") + _T("verbinclude version warning weakgroup $ @ \"\" & < > # { }"); // Python wxChar* PythonWordlist1 = - _T("and assert break class continue def del elif else except exec \ - finally for from global if import in is lambda None not or pass \ - print raise return try while yield"); + _T("and assert break class continue def del elif else except exec ") + _T("finally for from global if import in is lambda None not or pass ") + _T("print raise return try while yield"); wxChar* PythonWordlist2 = - _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN \ - BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS \ - COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX \ - DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE \ - LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON \ - RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 \ - STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY"); + _T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN ") + _T("BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS ") + _T("COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX ") + _T("DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE ") + _T("LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON ") + _T("RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 ") + _T("STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY"); //---------------------------------------------------------------------------- -- 2.45.2