use const char*, not char*, for string literals to avoid gcc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -709,7 +709,7 @@ EditProperties::EditProperties (Edit *edit,
|
|||||||
// EditPrint
|
// EditPrint
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
||||||
EditPrint::EditPrint (Edit *edit, wxChar *title)
|
EditPrint::EditPrint (Edit *edit, const wxChar *title)
|
||||||
: wxPrintout(title) {
|
: wxPrintout(title) {
|
||||||
m_edit = edit;
|
m_edit = edit;
|
||||||
m_printed = 0;
|
m_printed = 0;
|
||||||
|
@@ -152,7 +152,7 @@ class EditPrint: public wxPrintout {
|
|||||||
public:
|
public:
|
||||||
|
|
||||||
//! constructor
|
//! constructor
|
||||||
EditPrint (Edit *edit, wxChar *title = _T(""));
|
EditPrint (Edit *edit, const wxChar *title = _T(""));
|
||||||
|
|
||||||
//! event handlers
|
//! event handlers
|
||||||
bool OnPrintPage (int page);
|
bool OnPrintPage (int page);
|
||||||
|
@@ -59,7 +59,7 @@ const CommonInfo g_CommonPrefs = {
|
|||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// keywordlists
|
// keywordlists
|
||||||
// C++
|
// C++
|
||||||
char* CppWordlist1 =
|
const char* CppWordlist1 =
|
||||||
"asm auto bool break case catch char class const const_cast "
|
"asm auto bool break case catch char class const const_cast "
|
||||||
"continue default delete do double dynamic_cast else enum explicit "
|
"continue default delete do double dynamic_cast else enum explicit "
|
||||||
"export extern false float for friend goto if inline int long "
|
"export extern false float for friend goto if inline int long "
|
||||||
@@ -68,9 +68,9 @@ char* CppWordlist1 =
|
|||||||
"struct switch template this throw true try typedef typeid "
|
"struct switch template this throw true try typedef typeid "
|
||||||
"typename union unsigned using virtual void volatile wchar_t "
|
"typename union unsigned using virtual void volatile wchar_t "
|
||||||
"while";
|
"while";
|
||||||
char* CppWordlist2 =
|
const char* CppWordlist2 =
|
||||||
"file";
|
"file";
|
||||||
char* CppWordlist3 =
|
const char* CppWordlist3 =
|
||||||
"a addindex addtogroup anchor arg attention author b brief bug c "
|
"a addindex addtogroup anchor arg attention author b brief bug c "
|
||||||
"class code date def defgroup deprecated dontinclude e em endcode "
|
"class code date def defgroup deprecated dontinclude e em endcode "
|
||||||
"endhtmlonly endif endlatexonly endlink endverbatim enum example "
|
"endhtmlonly endif endlatexonly endlink endverbatim enum example "
|
||||||
@@ -83,11 +83,11 @@ char* CppWordlist3 =
|
|||||||
"verbinclude version warning weakgroup $ @ \"\" & < > # { }";
|
"verbinclude version warning weakgroup $ @ \"\" & < > # { }";
|
||||||
|
|
||||||
// Python
|
// Python
|
||||||
char* PythonWordlist1 =
|
const char* PythonWordlist1 =
|
||||||
"and assert break class continue def del elif else except exec "
|
"and assert break class continue def del elif else except exec "
|
||||||
"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 "
|
||||||
"print raise return try while yield";
|
"print raise return try while yield";
|
||||||
char* PythonWordlist2 =
|
const char* PythonWordlist2 =
|
||||||
"ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN "
|
"ACCELERATORS ALT AUTO3STATE AUTOCHECKBOX AUTORADIOBUTTON BEGIN "
|
||||||
"BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS "
|
"BITMAP BLOCK BUTTON CAPTION CHARACTERISTICS CHECKBOX CLASS "
|
||||||
"COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX "
|
"COMBOBOX CONTROL CTEXT CURSOR DEFPUSHBUTTON DIALOG DIALOGEX "
|
||||||
|
@@ -137,10 +137,10 @@ extern const int g_LanguagePrefsSize;
|
|||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// StyleInfo
|
// StyleInfo
|
||||||
struct StyleInfo {
|
struct StyleInfo {
|
||||||
wxChar *name;
|
const wxChar *name;
|
||||||
wxChar *foreground;
|
const wxChar *foreground;
|
||||||
wxChar *background;
|
const wxChar *background;
|
||||||
wxChar *fontname;
|
const wxChar *fontname;
|
||||||
int fontsize;
|
int fontsize;
|
||||||
int fontstyle;
|
int fontstyle;
|
||||||
int lettercase;
|
int lettercase;
|
||||||
|
Reference in New Issue
Block a user