AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compilation fix after _() changes; also don't use wxChar for purely ASCII strings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-01-09 14:35:11 +00:00
parent aaf4caeedc
commit 1153f54c0e
4 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/stc/defsext.h
View File

@ -24,7 +24,7 @@
// declarations // declarations
//============================================================================ //============================================================================
#define DEFAULT_LANGUAGE _("<default>") #define DEFAULT_LANGUAGE "<default>"
#define PAGE_COMMON _("Common") #define PAGE_COMMON _("Common")
#define PAGE_LANGUAGES _("Languages") #define PAGE_LANGUAGES _("Languages")

2
samples/stc/edit.cpp
View File

@ -439,7 +439,7 @@ bool Edit::InitializePrefs (const wxString &name) {
StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0); StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0);
StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0); StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0);
StyleSetCase (Nr, curType.lettercase); StyleSetCase (Nr, curType.lettercase);
const wxChar *pwords = curInfo->styles[Nr].words; const char *pwords = curInfo->styles[Nr].words;
if (pwords) { if (pwords) {
SetKeyWords (keywordnr, pwords); SetKeyWords (keywordnr, pwords);
keywordnr += 1; keywordnr += 1;

80
samples/stc/prefs.cpp
View File

@ -59,50 +59,50 @@ const CommonInfo g_CommonPrefs = {
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// keywordlists // keywordlists
// C++ // C++
wxChar* CppWordlist1 = char* CppWordlist1 =
_T("asm auto bool break case catch char class const const_cast ") "asm auto bool break case catch char class const const_cast "
_T("continue default delete do double dynamic_cast else enum explicit ") "continue default delete do double dynamic_cast else enum explicit "
_T("export extern false float for friend goto if inline int long ") "export extern false float for friend goto if inline int long "
_T("mutable namespace new operator private protected public register ") "mutable namespace new operator private protected public register "
_T("reinterpret_cast return short signed sizeof static static_cast ") "reinterpret_cast return short signed sizeof static static_cast "
_T("struct switch template this throw true try typedef typeid ") "struct switch template this throw true try typedef typeid "
_T("typename union unsigned using virtual void volatile wchar_t ") "typename union unsigned using virtual void volatile wchar_t "
_T("while"); "while";
wxChar* CppWordlist2 = char* CppWordlist2 =
_T("file"); "file";
wxChar* CppWordlist3 = char* CppWordlist3 =
_T("a addindex addtogroup anchor arg attention author b brief bug c ") "a addindex addtogroup anchor arg attention author b brief bug c "
_T("class code date def defgroup deprecated dontinclude e em endcode ") "class code date def defgroup deprecated dontinclude e em endcode "
_T("endhtmlonly endif endlatexonly endlink endverbatim enum example ") "endhtmlonly endif endlatexonly endlink endverbatim enum example "
_T("exception f$ f[ f] file fn hideinitializer htmlinclude ") "exception f$ f[ f] file fn hideinitializer htmlinclude "
_T("htmlonly if image include ingroup internal invariant interface ") "htmlonly if image include ingroup internal invariant interface "
_T("latexonly li line link mainpage name namespace nosubgrouping note ") "latexonly li line link mainpage name namespace nosubgrouping note "
_T("overload p page par param post pre ref relates remarks return ") "overload p page par param post pre ref relates remarks return "
_T("retval sa section see showinitializer since skip skipline struct ") "retval sa section see showinitializer since skip skipline struct "
_T("subsection test throw todo typedef union until var verbatim ") "subsection test throw todo typedef union until var verbatim "
_T("verbinclude version warning weakgroup $ @ \"\" & < > # { }"); "verbinclude version warning weakgroup $ @ \"\" & < > # { }";
// Python // Python
wxChar* PythonWordlist1 = char* PythonWordlist1 =
_T("and assert break class continue def del elif else except exec ") "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 ") "finally for from global if import in is lambda None not or pass "
_T("print raise return try while yield"); "print raise return try while yield";
wxChar* PythonWordlist2 = char* PythonWordlist2 =
_T("ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN ") "ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN "
_T("BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS ") "BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS "
_T("COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX ") "COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX "
_T("DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE ") "DISCARDABLE EDITTEXT END EXSTYLE FONT GROUPBOX ICON LANGUAGE "
_T("LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON ") "LISTBOX LTEXT MENU MENUEX MENUITEM MESSAGETABLE POPUP PUSHBUTTON "
_T("RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 ") "RADIOBUTTON RCDATA RTEXT SCROLLBAR SEPARATOR SHIFT STATE3 "
_T("STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY"); "STRINGTABLE STYLE TEXTINCLUDE VALUE VERSION VERSIONINFO VIRTKEY";
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
//! languages //! languages
const LanguageInfo g_LanguagePrefs [] = { const LanguageInfo g_LanguagePrefs [] = {
// C++ // C++
{_T("C++"), {"C++",
_T("*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma"), "*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma",
wxSTC_LEX_CPP, wxSTC_LEX_CPP,
{{mySTC_TYPE_DEFAULT, NULL}, {{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_COMMENT, NULL}, {mySTC_TYPE_COMMENT, NULL},
@ -138,8 +138,8 @@ const LanguageInfo g_LanguagePrefs [] = {
{-1, NULL}}, {-1, NULL}},
mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC}, mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC},
// Python // Python
{_T("Python"), {"Python",
_T("*.py;*.pyw"), "*.py;*.pyw",
wxSTC_LEX_PYTHON, wxSTC_LEX_PYTHON,
{{mySTC_TYPE_DEFAULT, NULL}, {{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_COMMENT_LINE, NULL}, {mySTC_TYPE_COMMENT_LINE, NULL},
@ -175,8 +175,8 @@ const LanguageInfo g_LanguagePrefs [] = {
{-1, NULL}}, {-1, NULL}},
mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY}, mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY},
// * (any) // * (any)
{(const wxChar *)DEFAULT_LANGUAGE, {wxTRANSLATE(DEFAULT_LANGUAGE),
_T("*.*"), "*.*",
wxSTC_LEX_PROPERTIES, wxSTC_LEX_PROPERTIES,
{{mySTC_TYPE_DEFAULT, NULL}, {{mySTC_TYPE_DEFAULT, NULL},
{mySTC_TYPE_DEFAULT, NULL}, {mySTC_TYPE_DEFAULT, NULL},

6
samples/stc/prefs.h
View File

@ -121,12 +121,12 @@ extern const CommonInfo g_CommonPrefs;
// LanguageInfo // LanguageInfo
struct LanguageInfo { struct LanguageInfo {
const wxChar *name; const char *name;
const wxChar *filepattern; const char *filepattern;
int lexer; int lexer;
struct { struct {
int type; int type;
const wxChar *words; const char *words;
} styles [STYLE_TYPES_COUNT]; } styles [STYLE_TYPES_COUNT];
int folds; int folds;
}; };