From 32083aa0de6e1e8940953dd69ad4be41f2f54c70 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Wed, 16 Jan 2002 17:48:48 +0000
Subject: [PATCH] Patch for using wxSTC with Borland, #504370

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/src/stc/makefile.b32 | 23 +++++++++++++++++------
 contrib/src/stc/stc.cpp      |  1 +
 contrib/src/stc/stc.cpp.in   |  1 +
 src/stc/makefile.b32         | 23 +++++++++++++++++------
 src/stc/stc.cpp              |  1 +
 src/stc/stc.cpp.in           |  1 +
 6 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 7a74f314af..40e5497e24 100644
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -62,16 +62,18 @@ OBJECTS = \
 	ScintillaWX.obj         \
 	stc.obj                 \
 
+STCCFG = stc.cfg
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
-!include $(WXDIR)\src\makelib.b32
+default: $(STCCFG) $(LIBTARGET)
 
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 {$(S)}.cxx.obj:
-	bcc32 $(CPPFLAGS) -P -c {$< }
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
 
-$(CFG): makefile.b32
+
+$(STCCFG): makefile.b32
 	copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
@@ -97,5 +99,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
-! $(CFG)
+! $(STCCFG)
+
+
+!include $(WXDIR)\src\makelib.b32
+
+{$(S)}.cpp.obj:
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
+.$(SRCSUFF).obj:
+	bcc32 $(STCCPPFLAGS) -c {$< }
 
diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 2d9c445db3..b2da830400 100644
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {
+    wxForceScintillaLexers();
     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 de370fc424..b3a666d865 100644
--- a/contrib/src/stc/stc.cpp.in
+++ b/contrib/src/stc/stc.cpp.in
@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {
+    wxForceScintillaLexers();
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 7a74f314af..40e5497e24 100644
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -62,16 +62,18 @@ OBJECTS = \
 	ScintillaWX.obj         \
 	stc.obj                 \
 
+STCCFG = stc.cfg
+STCCPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(STCCFG)
 
-!include $(WXDIR)\src\makelib.b32
+default: $(STCCFG) $(LIBTARGET)
 
-CFG = stc.cfg
-CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)
 
 {$(S)}.cxx.obj:
-	bcc32 $(CPPFLAGS) -P -c {$< }
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
 
-$(CFG): makefile.b32
+
+$(STCCFG): makefile.b32
 	copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3
@@ -97,5 +99,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
-! $(CFG)
+! $(STCCFG)
+
+
+!include $(WXDIR)\src\makelib.b32
+
+{$(S)}.cpp.obj:
+	bcc32 $(STCCPPFLAGS) -P -c {$< }
+
+.$(SRCSUFF).obj:
+	bcc32 $(STCCPPFLAGS) -c {$< }
 
diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 2d9c445db3..b2da830400 100644
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {
+    wxForceScintillaLexers();
     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 de370fc424..b3a666d865 100644
--- a/src/stc/stc.cpp.in
+++ b/src/stc/stc.cpp.in
@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {
+    wxForceScintillaLexers();
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
-- 
2.45.2