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

Updated the wxSTC makefile for Borland, and tweaked the sample a

Browse Source 
little.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-01 17:19:36 +00:00
parent 018e2f1300
commit c19d0121f6
4 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/samples/stc/stctest.cpp
View File

@@ -128,7 +128,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
ed = new wxStyledTextCtrl(this, ID_ED); ed = new wxStyledTextCtrl(this, ID_ED);
// Default font // Default font
wxFont font(8, wxMODERN, wxNORMAL, wxNORMAL); wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font); ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
ed->StyleClearAll(); ed->StyleClearAll();
@@ -148,9 +148,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
ed->StyleSetBold(10, TRUE); ed->StyleSetBold(10, TRUE);
#ifdef __WXMSW__ #ifdef __WXMSW__
ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:7"); ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9");
#else #else
ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:7"); ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9");
#endif #endif
// give it some text to play with // give it some text to play with

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

@@ -14,49 +14,48 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
SCINTILLA=.\scintilla SCINTILLA=.\scintilla
S=$(SCINTILLA)\src S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\lib\stc.lib LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
OBJECTS = \ OBJECTS = \
AutoComplete.obj \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
CellBuffer.obj \ CellBuffer.obj \
ContractionState.obj \ ContractionState.obj \
Document.obj \ Document.obj \
DocumentAccessor.obj \ DocumentAccessor.obj \
Editor.obj \ Editor.obj \
Indicator.obj \ Indicator.obj \
KeyMap.obj \ KeyMap.obj \
KeyWords.obj \ KeyWords.obj \
LexCPP.obj \ LexCPP.obj \
LexHTML.obj \ LexHTML.obj \
LexLua.obj \ LexLua.obj \
LexOthers.obj \ LexOthers.obj \
LexPerl.obj \ LexPerl.obj \
LexPython.obj \ LexPython.obj \
LexSQL.obj \ LexSQL.obj \
LexVB.obj \ LexVB.obj \
LineMarker.obj \ LineMarker.obj \
PropSet.obj \ PosRegExp.obj \
PosRegExp.obj \ PropSet.obj \
ScintillaBase.obj \ ScintillaBase.obj \
Style.obj \ Style.obj \
UniConversion.obj \ UniConversion.obj \
ViewStyle.obj \ ViewStyle.obj \
WindowAccessor.obj \ WindowAccessor.obj \
\ \
PlatWX.obj \ PlatWX.obj \
ScintillaWX.obj \ ScintillaWX.obj \
stc.obj \ stc.obj \
!include $(WXDIR)\src\makelib.b32 !include $(WXDIR)\src\makelib.b32
all: stc.cfg $(LIBTARGET)
CFG = stc.cfg CFG = stc.cfg
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)

6
samples/stc/stctest.cpp
View File

@@ -128,7 +128,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
ed = new wxStyledTextCtrl(this, ID_ED); ed = new wxStyledTextCtrl(this, ID_ED);
// Default font // Default font
wxFont font(8, wxMODERN, wxNORMAL, wxNORMAL); wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL);
ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font); ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font);
ed->StyleClearAll(); ed->StyleClearAll();
@@ -148,9 +148,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
ed->StyleSetBold(10, TRUE); ed->StyleSetBold(10, TRUE);
#ifdef __WXMSW__ #ifdef __WXMSW__
ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:7"); ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9");
#else #else
ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:7"); ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9");
#endif #endif
// give it some text to play with // give it some text to play with

65
src/stc/makefile.b32
View File

@@ -14,49 +14,48 @@
WXDIR = $(WXWIN) WXDIR = $(WXWIN)
SCINTILLA=.\scintilla SCINTILLA=.\scintilla
S=$(SCINTILLA)\src S=$(SCINTILLA)\src
STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S)
LIBTARGET=$(WXDIR)\lib\stc.lib LIBTARGET=$(WXDIR)\contrib\lib\stc.lib
OBJECTS = \ OBJECTS = \
AutoComplete.obj \ AutoComplete.obj \
CallTip.obj \ CallTip.obj \
CellBuffer.obj \ CellBuffer.obj \
ContractionState.obj \ ContractionState.obj \
Document.obj \ Document.obj \
DocumentAccessor.obj \ DocumentAccessor.obj \
Editor.obj \ Editor.obj \
Indicator.obj \ Indicator.obj \
KeyMap.obj \ KeyMap.obj \
KeyWords.obj \ KeyWords.obj \
LexCPP.obj \ LexCPP.obj \
LexHTML.obj \ LexHTML.obj \
LexLua.obj \ LexLua.obj \
LexOthers.obj \ LexOthers.obj \
LexPerl.obj \ LexPerl.obj \
LexPython.obj \ LexPython.obj \
LexSQL.obj \ LexSQL.obj \
LexVB.obj \ LexVB.obj \
LineMarker.obj \ LineMarker.obj \
PropSet.obj \ PosRegExp.obj \
PosRegExp.obj \ PropSet.obj \
ScintillaBase.obj \ ScintillaBase.obj \
Style.obj \ Style.obj \
UniConversion.obj \ UniConversion.obj \
ViewStyle.obj \ ViewStyle.obj \
WindowAccessor.obj \ WindowAccessor.obj \
\ \
PlatWX.obj \ PlatWX.obj \
ScintillaWX.obj \ ScintillaWX.obj \
stc.obj \ stc.obj \
!include $(WXDIR)\src\makelib.b32 !include $(WXDIR)\src\makelib.b32
all: stc.cfg $(LIBTARGET)
CFG = stc.cfg CFG = stc.cfg
CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)