From: Robin Dunn Date: Mon, 1 Oct 2001 17:19:36 +0000 (+0000) Subject: Updated the wxSTC makefile for Borland, and tweaked the sample a X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c19d0121f6e3216f21990135ba7238f7e2fe2a53 Updated the wxSTC makefile for Borland, and tweaked the sample a little. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/samples/stc/stctest.cpp b/contrib/samples/stc/stctest.cpp index bb581a99ab..b12ebf792f 100644 --- a/contrib/samples/stc/stctest.cpp +++ b/contrib/samples/stc/stctest.cpp @@ -128,7 +128,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) ed = new wxStyledTextCtrl(this, ID_ED); // Default font - wxFont font(8, wxMODERN, wxNORMAL, wxNORMAL); + wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL); ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font); ed->StyleClearAll(); @@ -148,9 +148,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) ed->StyleSetBold(10, TRUE); #ifdef __WXMSW__ - ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:7"); + ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9"); #else - ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:7"); + ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9"); #endif // give it some text to play with diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32 index 8e602b4098..492b4e26df 100644 --- a/contrib/src/stc/makefile.b32 +++ b/contrib/src/stc/makefile.b32 @@ -14,49 +14,48 @@ WXDIR = $(WXWIN) SCINTILLA=.\scintilla + S=$(SCINTILLA)\src STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -LIBTARGET=$(WXDIR)\lib\stc.lib +LIBTARGET=$(WXDIR)\contrib\lib\stc.lib OBJECTS = \ - AutoComplete.obj \ - CallTip.obj \ - CellBuffer.obj \ - ContractionState.obj \ - Document.obj \ - DocumentAccessor.obj \ - Editor.obj \ - Indicator.obj \ - KeyMap.obj \ - KeyWords.obj \ - LexCPP.obj \ - LexHTML.obj \ - LexLua.obj \ - LexOthers.obj \ - LexPerl.obj \ - LexPython.obj \ - LexSQL.obj \ - LexVB.obj \ - LineMarker.obj \ - PropSet.obj \ - PosRegExp.obj \ - ScintillaBase.obj \ - Style.obj \ - UniConversion.obj \ - ViewStyle.obj \ - WindowAccessor.obj \ - \ - PlatWX.obj \ - ScintillaWX.obj \ - stc.obj \ + AutoComplete.obj \ + CallTip.obj \ + CellBuffer.obj \ + ContractionState.obj \ + Document.obj \ + DocumentAccessor.obj \ + Editor.obj \ + Indicator.obj \ + KeyMap.obj \ + KeyWords.obj \ + LexCPP.obj \ + LexHTML.obj \ + LexLua.obj \ + LexOthers.obj \ + LexPerl.obj \ + LexPython.obj \ + LexSQL.obj \ + LexVB.obj \ + LineMarker.obj \ + PosRegExp.obj \ + PropSet.obj \ + ScintillaBase.obj \ + Style.obj \ + UniConversion.obj \ + ViewStyle.obj \ + WindowAccessor.obj \ + \ + PlatWX.obj \ + ScintillaWX.obj \ + stc.obj \ !include $(WXDIR)\src\makelib.b32 -all: stc.cfg $(LIBTARGET) - CFG = stc.cfg CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp index bb581a99ab..b12ebf792f 100644 --- a/samples/stc/stctest.cpp +++ b/samples/stc/stctest.cpp @@ -128,7 +128,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) ed = new wxStyledTextCtrl(this, ID_ED); // Default font - wxFont font(8, wxMODERN, wxNORMAL, wxNORMAL); + wxFont font(10, wxMODERN, wxNORMAL, wxNORMAL); ed->StyleSetFont(wxSTC_STYLE_DEFAULT, font); ed->StyleClearAll(); @@ -148,9 +148,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) ed->StyleSetBold(10, TRUE); #ifdef __WXMSW__ - ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:7"); + ed->StyleSetSpec(2, "fore:#007f00,bold,face:Arial,size:9"); #else - ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:7"); + ed->StyleSetSpec(2, "fore:#007f00,bold,face:Helvetica,size:9"); #endif // give it some text to play with diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32 index 8e602b4098..492b4e26df 100644 --- a/src/stc/makefile.b32 +++ b/src/stc/makefile.b32 @@ -14,49 +14,48 @@ WXDIR = $(WXWIN) SCINTILLA=.\scintilla + S=$(SCINTILLA)\src STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) -LIBTARGET=$(WXDIR)\lib\stc.lib +LIBTARGET=$(WXDIR)\contrib\lib\stc.lib OBJECTS = \ - AutoComplete.obj \ - CallTip.obj \ - CellBuffer.obj \ - ContractionState.obj \ - Document.obj \ - DocumentAccessor.obj \ - Editor.obj \ - Indicator.obj \ - KeyMap.obj \ - KeyWords.obj \ - LexCPP.obj \ - LexHTML.obj \ - LexLua.obj \ - LexOthers.obj \ - LexPerl.obj \ - LexPython.obj \ - LexSQL.obj \ - LexVB.obj \ - LineMarker.obj \ - PropSet.obj \ - PosRegExp.obj \ - ScintillaBase.obj \ - Style.obj \ - UniConversion.obj \ - ViewStyle.obj \ - WindowAccessor.obj \ - \ - PlatWX.obj \ - ScintillaWX.obj \ - stc.obj \ + AutoComplete.obj \ + CallTip.obj \ + CellBuffer.obj \ + ContractionState.obj \ + Document.obj \ + DocumentAccessor.obj \ + Editor.obj \ + Indicator.obj \ + KeyMap.obj \ + KeyWords.obj \ + LexCPP.obj \ + LexHTML.obj \ + LexLua.obj \ + LexOthers.obj \ + LexPerl.obj \ + LexPython.obj \ + LexSQL.obj \ + LexVB.obj \ + LineMarker.obj \ + PosRegExp.obj \ + PropSet.obj \ + ScintillaBase.obj \ + Style.obj \ + UniConversion.obj \ + ViewStyle.obj \ + WindowAccessor.obj \ + \ + PlatWX.obj \ + ScintillaWX.obj \ + stc.obj \ !include $(WXDIR)\src\makelib.b32 -all: stc.cfg $(LIBTARGET) - CFG = stc.cfg CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG)