Patch for using wxSTC with Borland, #504370

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

diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32
index 7a74f314afdf214f63d43e95dd14e40c672ee1f1..40e5497e246fe1f75ca39cf060f6ba833552a670 100644 (file)
--- a/contrib/src/stc/makefile.b32
+++ b/contrib/src/stc/makefile.b32
@@ -62,16 +62,18 @@ OBJECTS = \
        ScintillaWX.obj         \
        stc.obj                 \
 
        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:
 
 {$(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
        copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3


@@ -97,5 +99,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
 $(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 2d9c445db3f2a42aa395dbb0b6f259b3ba80a1a9..b2da83040084c26482feae3a00063325e31a8810 100644 (file)
--- 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)
 {
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {

+    wxForceScintillaLexers();

     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
     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 de370fc4243359726c30ff6f0fc7b0865ba40fd5..b3a666d8655aa9b528ce9101548473beb636eb35 100644 (file)
--- 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)
 {
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {

+    wxForceScintillaLexers();

     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;

diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32
index 7a74f314afdf214f63d43e95dd14e40c672ee1f1..40e5497e246fe1f75ca39cf060f6ba833552a670 100644 (file)
--- a/src/stc/makefile.b32
+++ b/src/stc/makefile.b32
@@ -62,16 +62,18 @@ OBJECTS = \
        ScintillaWX.obj         \
        stc.obj                 \
 
        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:
 
 {$(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
        copy &&!
 -H=$(WXDIR)\src\msw\wx32.csm
 -3


@@ -97,5 +99,14 @@ $(OPT)
 $(DEBUG_FLAGS)
 $(WIN95FLAG)
 $(STCEXTRACPPFLAGS)
 $(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 2d9c445db3f2a42aa395dbb0b6f259b3ba80a1a9..b2da83040084c26482feae3a00063325e31a8810 100644 (file)
--- 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)
 {
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {

+    wxForceScintillaLexers();

     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
     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 de370fc4243359726c30ff6f0fc7b0865ba40fd5..b3a666d8655aa9b528ce9101548473beb636eb35 100644 (file)
--- 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)
 {
               style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
               wxDefaultValidator, name)
 {

+    wxForceScintillaLexers();

     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;
     m_swx = new ScintillaWX(this);
     m_stopWatch.Start();
     m_lastKeyDownConsumed = FALSE;