Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some tweaks for LINK_LEXERS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-09-05 19:36:59 +00:00
parent e015d1f7da
commit 40716a510b
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/src/stc/stc.cpp
View File

@@ -115,8 +115,10 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
#ifdef LINK_LEXERS
// forces the linking of the lexer modules // forces the linking of the lexer modules
int Scintilla_LinkLexers(); int wxForceScintillaLexers();
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Constructor and Destructor // Constructor and Destructor
@@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
Scintilla_LinkLexers(); #ifdef LINK_LEXERS
wxForceScintillaLexers();
#endif
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

8
contrib/src/stc/stc.cpp.in
View File

@@ -115,8 +115,10 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
#ifdef LINK_LEXERS
// forces the linking of the lexer modules // forces the linking of the lexer modules
int Scintilla_LinkLexers(); int wxForceScintillaLexers();
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Constructor and Destructor // Constructor and Destructor
@@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
Scintilla_LinkLexers(); #ifdef LINK_LEXERS
wxForceScintillaLexers();
#endif
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

8
src/stc/stc.cpp
View File

@@ -115,8 +115,10 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
#ifdef LINK_LEXERS
// forces the linking of the lexer modules // forces the linking of the lexer modules
int Scintilla_LinkLexers(); int wxForceScintillaLexers();
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Constructor and Destructor // Constructor and Destructor
@@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
Scintilla_LinkLexers(); #ifdef LINK_LEXERS
wxForceScintillaLexers();
#endif
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

8
src/stc/stc.cpp.in
View File

@@ -115,8 +115,10 @@ END_EVENT_TABLE()
IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl) IMPLEMENT_CLASS(wxStyledTextCtrl, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent) IMPLEMENT_DYNAMIC_CLASS(wxStyledTextEvent, wxCommandEvent)
#ifdef LINK_LEXERS
// forces the linking of the lexer modules // forces the linking of the lexer modules
int Scintilla_LinkLexers(); int wxForceScintillaLexers();
#endif
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// Constructor and Destructor // Constructor and Destructor
@@ -131,7 +133,9 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
Scintilla_LinkLexers(); #ifdef LINK_LEXERS
wxForceScintillaLexers();
#endif
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;