diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h index 88fc6b40cf..d152c377eb 100644 --- a/samples/stc/defsext.h +++ b/samples/stc/defsext.h @@ -66,9 +66,9 @@ enum { myID_CHANGECASE, myID_CHANGELOWER, myID_CHANGEUPPER, - myID_HILIGHTLANG, - myID_HILIGHTFIRST, - myID_HILIGHTLAST = myID_HILIGHTFIRST + 99, + myID_HIGHLIGHTLANG, + myID_HIGHLIGHTFIRST, + myID_HIGHLIGHTLAST = myID_HIGHLIGHTFIRST + 99, myID_CONVERTEOL, myID_CONVERTCR, myID_CONVERTCRLF, diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp index d4b8d55a09..0b3e198dae 100644 --- a/samples/stc/edit.cpp +++ b/samples/stc/edit.cpp @@ -82,8 +82,8 @@ wxBEGIN_EVENT_TABLE (Edit, wxStyledTextCtrl) EVT_MENU (myID_BRACEMATCH, Edit::OnBraceMatch) EVT_MENU (myID_GOTO, Edit::OnGoto) // view - EVT_MENU_RANGE (myID_HILIGHTFIRST, myID_HILIGHTLAST, - Edit::OnHilightLang) + EVT_MENU_RANGE (myID_HIGHLIGHTFIRST, myID_HIGHLIGHTLAST, + Edit::OnHighlightLang) EVT_MENU (myID_DISPLAYEOL, Edit::OnDisplayEOL) EVT_MENU (myID_INDENTGUIDE, Edit::OnIndentGuide) EVT_MENU (myID_LINENUMBER, Edit::OnLineNumber) @@ -290,8 +290,8 @@ void Edit::OnEditSelectLine (wxCommandEvent &WXUNUSED(event)) { SetSelection (lineStart, lineEnd); } -void Edit::OnHilightLang (wxCommandEvent &event) { - InitializePrefs (g_LanguagePrefs [event.GetId() - myID_HILIGHTFIRST].name); +void Edit::OnHighlightLang (wxCommandEvent &event) { + InitializePrefs (g_LanguagePrefs [event.GetId() - myID_HIGHLIGHTFIRST].name); } void Edit::OnDisplayEOL (wxCommandEvent &WXUNUSED(event)) { diff --git a/samples/stc/edit.h b/samples/stc/edit.h index a91cc335da..1349688b83 100644 --- a/samples/stc/edit.h +++ b/samples/stc/edit.h @@ -79,7 +79,7 @@ public: void OnEditSelectAll (wxCommandEvent &event); void OnEditSelectLine (wxCommandEvent &event); //! view - void OnHilightLang (wxCommandEvent &event); + void OnHighlightLang (wxCommandEvent &event); void OnDisplayEOL (wxCommandEvent &event); void OnIndentGuide (wxCommandEvent &event); void OnLineNumber (wxCommandEvent &event); diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index 8b70430481..1a13ebe53d 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -486,10 +486,10 @@ void AppFrame::CreateMenu () menuEdit->Append (myID_SELECTLINE, _("Select &line\tCtrl+L")); // highlight submenu - wxMenu *menuHilight = new wxMenu; + wxMenu *menuHighlight = new wxMenu; int Nr; for (Nr = 0; Nr < g_LanguagePrefsSize; Nr++) { - menuHilight->Append (myID_HILIGHTFIRST + Nr, + menuHighlight->Append (myID_HIGHLIGHTFIRST + Nr, g_LanguagePrefs [Nr].name); } @@ -500,7 +500,7 @@ void AppFrame::CreateMenu () // View menu wxMenu *menuView = new wxMenu; - menuView->Append (myID_HILIGHTLANG, _("&Highlight language .."), menuHilight); + menuView->Append (myID_HIGHLIGHTLANG, _("&Highlight language .."), menuHighlight); menuView->AppendSeparator(); menuView->AppendCheckItem (myID_FOLDTOGGLE, _("&Toggle current fold\tCtrl+T")); menuView->AppendCheckItem (myID_OVERTYPE, _("&Overwrite mode\tIns"));