diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp index 39cbba6900..7ab2c32a0b 100644 --- a/contrib/src/stc/stc.cpp +++ b/contrib/src/stc/stc.cpp @@ -115,8 +115,10 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) +#ifdef LINK_LEXERS // forces the linking of the lexer modules -int Scintilla_LinkLexers(); +int wxForceScintillaLexers(); +#endif //---------------------------------------------------------------------- // Constructor and Destructor @@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, wxDefaultValidator, name) { - Scintilla_LinkLexers(); +#ifdef LINK_LEXERS + wxForceScintillaLexers(); +#endif m_swx = new ScintillaWX(this); m_stopWatch.Start(); m_lastKeyDownConsumed = FALSE; diff --git a/contrib/src/stc/stc.cpp.in b/contrib/src/stc/stc.cpp.in index c1543d51d3..6d9898f231 100644 --- a/contrib/src/stc/stc.cpp.in +++ b/contrib/src/stc/stc.cpp.in @@ -115,8 +115,10 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) +#ifdef LINK_LEXERS // forces the linking of the lexer modules -int Scintilla_LinkLexers(); +int wxForceScintillaLexers(); +#endif //---------------------------------------------------------------------- // Constructor and Destructor @@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, wxDefaultValidator, name) { - Scintilla_LinkLexers(); +#ifdef LINK_LEXERS + wxForceScintillaLexers(); +#endif m_swx = new ScintillaWX(this); m_stopWatch.Start(); m_lastKeyDownConsumed = FALSE; diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index 39cbba6900..7ab2c32a0b 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -115,8 +115,10 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) +#ifdef LINK_LEXERS // forces the linking of the lexer modules -int Scintilla_LinkLexers(); +int wxForceScintillaLexers(); +#endif //---------------------------------------------------------------------- // Constructor and Destructor @@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, wxDefaultValidator, name) { - Scintilla_LinkLexers(); +#ifdef LINK_LEXERS + wxForceScintillaLexers(); +#endif m_swx = new ScintillaWX(this); m_stopWatch.Start(); m_lastKeyDownConsumed = FALSE; diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index c1543d51d3..6d9898f231 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -115,8 +115,10 @@ END_EVENT_TABLE() IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) +#ifdef LINK_LEXERS // forces the linking of the lexer modules -int Scintilla_LinkLexers(); +int wxForceScintillaLexers(); +#endif //---------------------------------------------------------------------- // Constructor and Destructor @@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, wxDefaultValidator, name) { - Scintilla_LinkLexers(); +#ifdef LINK_LEXERS + wxForceScintillaLexers(); +#endif m_swx = new ScintillaWX(this); m_stopWatch.Start(); m_lastKeyDownConsumed = FALSE;