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

Patch for using wxSTC with Borland, #504370

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-01-16 17:48:48 +00:00
parent 5ff5710d55
commit 32083aa0de
6 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
contrib/src/stc/makefile.b32
View File

@@ -62,16 +62,18 @@ OBJECTS = \
ScintillaWX.obj \ ScintillaWX.obj \
stc.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 &&! copy &&!
-H=$(WXDIR)\src\msw\wx32.csm -H=$(WXDIR)\src\msw\wx32.csm
-3 -3
@@ -97,5 +99,14 @@ $(OPT)
$(DEBUG_FLAGS) $(DEBUG_FLAGS)
$(WIN95FLAG) $(WIN95FLAG)
$(STCEXTRACPPFLAGS) $(STCEXTRACPPFLAGS)
! $(CFG) ! $(STCCFG)
!include $(WXDIR)\src\makelib.b32
{$(S)}.cpp.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
.$(SRCSUFF).obj:
bcc32 $(STCCPPFLAGS) -c {$< }

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

@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
wxForceScintillaLexers();
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

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

@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
wxForceScintillaLexers();
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

23
src/stc/makefile.b32
View File

@@ -62,16 +62,18 @@ OBJECTS = \
ScintillaWX.obj \ ScintillaWX.obj \
stc.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 &&! copy &&!
-H=$(WXDIR)\src\msw\wx32.csm -H=$(WXDIR)\src\msw\wx32.csm
-3 -3
@@ -97,5 +99,14 @@ $(OPT)
$(DEBUG_FLAGS) $(DEBUG_FLAGS)
$(WIN95FLAG) $(WIN95FLAG)
$(STCEXTRACPPFLAGS) $(STCEXTRACPPFLAGS)
! $(CFG) ! $(STCCFG)
!include $(WXDIR)\src\makelib.b32
{$(S)}.cpp.obj:
bcc32 $(STCCPPFLAGS) -P -c {$< }
.$(SRCSUFF).obj:
bcc32 $(STCCPPFLAGS) -c {$< }

1
src/stc/stc.cpp
View File

@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
wxForceScintillaLexers();
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;

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

@@ -143,6 +143,7 @@ wxStyledTextCtrl::wxStyledTextCtrl(wxWindow *parent,
style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN, style | wxVSCROLL | wxHSCROLL | wxWANTS_CHARS | wxCLIP_CHILDREN,
wxDefaultValidator, name) wxDefaultValidator, name)
{ {
wxForceScintillaLexers();
m_swx = new ScintillaWX(this); m_swx = new ScintillaWX(this);
m_stopWatch.Start(); m_stopWatch.Start();
m_lastKeyDownConsumed = FALSE; m_lastKeyDownConsumed = FALSE;