From: Robin Dunn <robin@alldunn.com>
Date: Thu, 5 Sep 2002 19:36:59 +0000 (+0000)
Subject: some tweaks for LINK_LEXERS
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/40716a510ba4e2f74add8a9c1756954a1fa82da6

some tweaks for LINK_LEXERS


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

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;