X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a8b04e9c387b5e5295d42f2ed23afcf37e3c2e..5c3a7f71a6a9d40a64af96b587161adfb54f90af:/samples/stc/prefs.cpp

diff --git a/samples/stc/prefs.cpp b/samples/stc/prefs.cpp
index 7927082f75..b2275b1231 100644
--- a/samples/stc/prefs.cpp
+++ b/samples/stc/prefs.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
-// File:        prefs.cpp
+// File:        contrib/samples/stc/prefs.cpp
 // Purpose:     STC test Preferences initialization
 // Maintainer:  Wyo
 // Created:     2003-09-01
@@ -12,22 +12,22 @@
 // headers
 //----------------------------------------------------------------------------
 
-// For compilers that support precompilation, includes <wx/wx.h>.
-#include <wx/wxprec.h>
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all 'standard' wxWindows headers)
+// need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
-    #include <wx/wx.h>
+    #include "wx/wx.h"
 #endif
 
-//! wxWindows headers
+//! wxWidgets headers
 
-//! wxWindows/contrib headers
+//! wxWidgets/contrib headers
 
 //! application headers
 #include "defsext.h"     // Additional definitions
@@ -59,50 +59,50 @@ 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");
-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 $ @ "" & < > # { }");
+const char* CppWordlist1 =
+    "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";
+const char* CppWordlist2 =
+    "file";
+const char* CppWordlist3 =
+    "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 $ @ \"\" & < > # { }";
 
 // 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");
-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");
+const char* PythonWordlist1 =
+    "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";
+const char* PythonWordlist2 =
+    "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";
 
 
 //----------------------------------------------------------------------------
 //! languages
 const LanguageInfo g_LanguagePrefs [] = {
     // C++
-    {_T("C++"),
-     _T("*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma"),
+    {"C++",
+     "*.c;*.cc;*.cpp;*.cxx;*.cs;*.h;*.hh;*.hpp;*.hxx;*.sma",
      wxSTC_LEX_CPP,
      {{mySTC_TYPE_DEFAULT, NULL},
       {mySTC_TYPE_COMMENT, NULL},
@@ -138,8 +138,8 @@ const LanguageInfo g_LanguagePrefs [] = {
       {-1, NULL}},
      mySTC_FOLD_COMMENT | mySTC_FOLD_COMPACT | mySTC_FOLD_PREPROC},
     // Python
-    {_T("Python"),
-     _T("*.py;*.pyw"),
+    {"Python",
+     "*.py;*.pyw",
      wxSTC_LEX_PYTHON,
      {{mySTC_TYPE_DEFAULT, NULL},
       {mySTC_TYPE_COMMENT_LINE, NULL},
@@ -175,8 +175,8 @@ const LanguageInfo g_LanguagePrefs [] = {
       {-1, NULL}},
      mySTC_FOLD_COMMENTPY | mySTC_FOLD_QUOTESPY},
     // * (any)
-    {(wxChar *)DEFAULT_LANGUAGE,
-     _T("*.*"),
+    {wxTRANSLATE(DEFAULT_LANGUAGE),
+     "*.*",
      wxSTC_LEX_PROPERTIES,
      {{mySTC_TYPE_DEFAULT, NULL},
       {mySTC_TYPE_DEFAULT, NULL},
@@ -376,4 +376,3 @@ const StyleInfo g_StylePrefs [] = {
     };
 
 const int g_StylePrefsSize = WXSIZEOF(g_StylePrefs);
-