From 0e974385f6ab66910ee42ca287fbf9ada2392dc1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 18 Sep 2003 17:35:31 +0000 Subject: [PATCH] Patch #808669 more warngins and unicode fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/samples/stc/edit.cpp | 42 ++++++++++++++++----------------- contrib/samples/stc/stctest.cpp | 5 ++-- contrib/src/stc/ScintillaWX.cpp | 4 ++++ samples/stc/edit.cpp | 42 ++++++++++++++++----------------- samples/stc/stctest.cpp | 5 ++-- src/stc/ScintillaWX.cpp | 4 ++++ 6 files changed, 56 insertions(+), 46 deletions(-) diff --git a/contrib/samples/stc/edit.cpp b/contrib/samples/stc/edit.cpp index 82ee73271a..5c0aef717d 100644 --- a/contrib/samples/stc/edit.cpp +++ b/contrib/samples/stc/edit.cpp @@ -132,11 +132,11 @@ Edit::Edit (wxWindow *parent, wxWindowID id, wxSTC_WRAP_WORD: wxSTC_WRAP_NONE); wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL); StyleSetFont (wxSTC_STYLE_DEFAULT, font); - StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour ("BLACK")); - StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColour ("WHITE")); - StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour ("DARK GREY")); - StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour ("WHITE")); - StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour ("DARK GREY")); + StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("BLACK"))); + StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColour (_T("WHITE"))); + StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY"))); + StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE"))); + StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY"))); InitializePrefs (DEFAULT_LANGUAGE); // set visibility @@ -145,13 +145,13 @@ Edit::Edit (wxWindow *parent, wxWindowID id, SetYCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1); // markers - MarkerDefine (wxSTC_MARKNUM_FOLDER, wxSTC_MARK_DOTDOTDOT, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_DOTDOTDOT, "BLACK", "WHITE"); - MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, "BLACK", "WHITE"); - MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); + MarkerDefine (wxSTC_MARKNUM_FOLDER, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("WHITE")); + MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("WHITE")); + MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); // miscelaneous m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, _T("_999999")); @@ -233,11 +233,11 @@ void Edit::OnBraceMatch (wxCommandEvent &WXUNUSED(event)) { void Edit::OnGoto (wxCommandEvent &WXUNUSED(event)) { } -void Edit::OnEditIndentInc (wxCommandEvent &event) { +void Edit::OnEditIndentInc (wxCommandEvent &WXUNUSED(event)) { CmdKeyExecute (wxSTC_CMD_TAB); } -void Edit::OnEditIndentRed (wxCommandEvent &event) { +void Edit::OnEditIndentRed (wxCommandEvent &WXUNUSED(event)) { CmdKeyExecute (wxSTC_CMD_DELETEBACK); } @@ -407,8 +407,8 @@ bool Edit::InitializePrefs (const wxString &name) { // set margin for line numbers SetMarginType (m_LineNrID, wxSTC_MARGIN_NUMBER); - StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour ("DARK GREY")); - StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour ("WHITE")); + StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY"))); + StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE"))); SetMarginWidth (m_LineNrID, g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0); @@ -420,8 +420,8 @@ bool Edit::InitializePrefs (const wxString &name) { } // set common styles - StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour ("DARK GREY")); - StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour ("DARK GREY")); + StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("DARK GREY"))); + StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY"))); // initialize settings if (g_CommonPrefs.syntaxEnable) { @@ -459,7 +459,7 @@ bool Edit::InitializePrefs (const wxString &name) { // folding SetMarginType (m_FoldingID, wxSTC_MARGIN_SYMBOL); SetMarginMask (m_FoldingID, wxSTC_MASK_FOLDERS); - StyleSetBackground (m_FoldingID, wxColour ("WHITE")); + StyleSetBackground (m_FoldingID, wxColour (_T("WHITE"))); SetMarginWidth (m_FoldingID, 0); SetMarginSensitive (m_FoldingID, false); if (g_CommonPrefs.foldEnable) { @@ -601,7 +601,7 @@ EditProperties::EditProperties (Edit *edit, long style) : wxDialog (edit, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { + style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { // sets the application title SetTitle (_("Properties")); @@ -786,7 +786,7 @@ void EditPrint::GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int * *selPageTo = *maxPage; } -bool EditPrint::HasPage (int page) { +bool EditPrint::HasPage (int WXUNUSED(page)) { return (m_printed < m_edit->GetLength()); } diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp index 8c27905685..5331ae5114 100644 --- a/contrib/samples/stc/stctest.cpp +++ b/contrib/samples/stc/stctest.cpp @@ -32,6 +32,7 @@ #include // notebook support #include // system settings #include // strings support +#include // images support //! application headers #include "defsext.h" // Additional definitions @@ -583,7 +584,7 @@ AppAbout::AppAbout (wxWindow *parent, long style) : wxDialog (parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { + style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { // set timer if any m_timer = NULL; @@ -651,7 +652,7 @@ AppAbout::~AppAbout () { //---------------------------------------------------------------------------- // event handlers -void AppAbout::OnTimerEvent (wxTimerEvent &event) { +void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) { if (m_timer) delete m_timer; m_timer = NULL; EndModal (wxID_OK); diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp index f294cd6ba2..163a89afb4 100644 --- a/contrib/src/stc/ScintillaWX.cpp +++ b/contrib/src/stc/ScintillaWX.cpp @@ -677,7 +677,11 @@ void ScintillaWX::DoAddChar(int key) { } +#ifdef __WXMAC__ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) { +#else +int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) { +#endif #if defined(__WXGTK__) || defined(__WXMAC__) // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK // TODO: Check this, it shouldn't be true any longer. diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index 82ee73271a..5c0aef717d 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -132,11 +132,11 @@ Edit::Edit (wxWindow *parent, wxWindowID id, wxSTC_WRAP_WORD: wxSTC_WRAP_NONE); wxFont font (10, wxMODERN, wxNORMAL, wxNORMAL); StyleSetFont (wxSTC_STYLE_DEFAULT, font); - StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour ("BLACK")); - StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColour ("WHITE")); - StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour ("DARK GREY")); - StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour ("WHITE")); - StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour ("DARK GREY")); + StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("BLACK"))); + StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColour (_T("WHITE"))); + StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY"))); + StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE"))); + StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY"))); InitializePrefs (DEFAULT_LANGUAGE); // set visibility @@ -145,13 +145,13 @@ Edit::Edit (wxWindow *parent, wxWindowID id, SetYCaretPolicy (wxSTC_CARET_EVEN|wxSTC_VISIBLE_STRICT|wxSTC_CARET_SLOP, 1); // markers - MarkerDefine (wxSTC_MARKNUM_FOLDER, wxSTC_MARK_DOTDOTDOT, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_DOTDOTDOT, "BLACK", "WHITE"); - MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, "BLACK", "WHITE"); - MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); - MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY, "BLACK", "BLACK"); + MarkerDefine (wxSTC_MARKNUM_FOLDER, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_DOTDOTDOT, _T("BLACK"), _T("WHITE")); + MarkerDefine (wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_ARROWDOWN, _T("BLACK"), _T("WHITE")); + MarkerDefine (wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); + MarkerDefine (wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_EMPTY, _T("BLACK"), _T("BLACK")); // miscelaneous m_LineNrMargin = TextWidth (wxSTC_STYLE_LINENUMBER, _T("_999999")); @@ -233,11 +233,11 @@ void Edit::OnBraceMatch (wxCommandEvent &WXUNUSED(event)) { void Edit::OnGoto (wxCommandEvent &WXUNUSED(event)) { } -void Edit::OnEditIndentInc (wxCommandEvent &event) { +void Edit::OnEditIndentInc (wxCommandEvent &WXUNUSED(event)) { CmdKeyExecute (wxSTC_CMD_TAB); } -void Edit::OnEditIndentRed (wxCommandEvent &event) { +void Edit::OnEditIndentRed (wxCommandEvent &WXUNUSED(event)) { CmdKeyExecute (wxSTC_CMD_DELETEBACK); } @@ -407,8 +407,8 @@ bool Edit::InitializePrefs (const wxString &name) { // set margin for line numbers SetMarginType (m_LineNrID, wxSTC_MARGIN_NUMBER); - StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour ("DARK GREY")); - StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour ("WHITE")); + StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColour (_T("DARK GREY"))); + StyleSetBackground (wxSTC_STYLE_LINENUMBER, wxColour (_T("WHITE"))); SetMarginWidth (m_LineNrID, g_CommonPrefs.lineNumberEnable? m_LineNrMargin: 0); @@ -420,8 +420,8 @@ bool Edit::InitializePrefs (const wxString &name) { } // set common styles - StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour ("DARK GREY")); - StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour ("DARK GREY")); + StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColour (_T("DARK GREY"))); + StyleSetForeground (wxSTC_STYLE_INDENTGUIDE, wxColour (_T("DARK GREY"))); // initialize settings if (g_CommonPrefs.syntaxEnable) { @@ -459,7 +459,7 @@ bool Edit::InitializePrefs (const wxString &name) { // folding SetMarginType (m_FoldingID, wxSTC_MARGIN_SYMBOL); SetMarginMask (m_FoldingID, wxSTC_MASK_FOLDERS); - StyleSetBackground (m_FoldingID, wxColour ("WHITE")); + StyleSetBackground (m_FoldingID, wxColour (_T("WHITE"))); SetMarginWidth (m_FoldingID, 0); SetMarginSensitive (m_FoldingID, false); if (g_CommonPrefs.foldEnable) { @@ -601,7 +601,7 @@ EditProperties::EditProperties (Edit *edit, long style) : wxDialog (edit, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { + style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { // sets the application title SetTitle (_("Properties")); @@ -786,7 +786,7 @@ void EditPrint::GetPageInfo (int *minPage, int *maxPage, int *selPageFrom, int * *selPageTo = *maxPage; } -bool EditPrint::HasPage (int page) { +bool EditPrint::HasPage (int WXUNUSED(page)) { return (m_printed < m_edit->GetLength()); } diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 8c27905685..5331ae5114 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -32,6 +32,7 @@ #include // notebook support #include // system settings #include // strings support +#include // images support //! application headers #include "defsext.h" // Additional definitions @@ -583,7 +584,7 @@ AppAbout::AppAbout (wxWindow *parent, long style) : wxDialog (parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { + style | wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { // set timer if any m_timer = NULL; @@ -651,7 +652,7 @@ AppAbout::~AppAbout () { //---------------------------------------------------------------------------- // event handlers -void AppAbout::OnTimerEvent (wxTimerEvent &event) { +void AppAbout::OnTimerEvent (wxTimerEvent &WXUNUSED(event)) { if (m_timer) delete m_timer; m_timer = NULL; EndModal (wxID_OK); diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index f294cd6ba2..163a89afb4 100644 --- a/src/stc/ScintillaWX.cpp +++ b/src/stc/ScintillaWX.cpp @@ -677,7 +677,11 @@ void ScintillaWX::DoAddChar(int key) { } +#ifdef __WXMAC__ int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool meta, bool* consumed) { +#else +int ScintillaWX::DoKeyDown(int key, bool shift, bool ctrl, bool alt, bool WXUNUSED(meta), bool* consumed) { +#endif #if defined(__WXGTK__) || defined(__WXMAC__) // Ctrl chars (A-Z) end up with the wrong keycode on wxGTK // TODO: Check this, it shouldn't be true any longer. -- 2.45.2