X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a29a241fd60b5df7506e2dd4d8b89eb483da90e8..c731eb47101d4656e5b736ce8e377830911bbe1d:/wxPython/demo/wxStyledTextCtrl_2.py diff --git a/wxPython/demo/wxStyledTextCtrl_2.py b/wxPython/demo/wxStyledTextCtrl_2.py index 51a14386bd..325c4ea6ae 100644 --- a/wxPython/demo/wxStyledTextCtrl_2.py +++ b/wxPython/demo/wxStyledTextCtrl_2.py @@ -29,8 +29,8 @@ else: 'mono' : 'Courier', 'helv' : 'Helvetica', 'other': 'new century schoolbook', - 'size' : 13, - 'size2': 11, + 'size' : 12, + 'size2': 10, } @@ -38,7 +38,8 @@ else: class PythonSTC(wxStyledTextCtrl): def __init__(self, parent, ID): - wxStyledTextCtrl.__init__(self, parent, ID) + wxStyledTextCtrl.__init__(self, parent, ID, + style = wxNO_FULL_REPAINT_ON_RESIZE) self.CmdKeyAssign(ord('B'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMIN) self.CmdKeyAssign(ord('N'), wxSTC_SCMOD_CTRL, wxSTC_CMD_ZOOMOUT) @@ -61,9 +62,25 @@ class PythonSTC(wxStyledTextCtrl): self.SetMarginType(2, wxSTC_MARGIN_SYMBOL) self.SetMarginMask(2, wxSTC_MASK_FOLDERS) self.SetMarginSensitive(2, true) - self.SetMarginWidth(2, 15) - self.MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_ARROW, "navy", "navy") - self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "navy", "navy") + self.SetMarginWidth(2, 12) + + if 0: # simple folder marks, like the old version + self.MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_ARROW, "navy", "navy") + self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_ARROWDOWN, "navy", "navy") + # Set these to an invisible mark + self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BACKGROUND, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_BACKGROUND, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_BACKGROUND, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_BACKGROUND, "white", "black") + + else: # more involved "outlining" folder marks + self.MarkerDefine(wxSTC_MARKNUM_FOLDEREND, wxSTC_MARK_BOXPLUSCONNECTED, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPENMID, wxSTC_MARK_BOXMINUSCONNECTED, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERMIDTAIL, wxSTC_MARK_TCORNER, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERTAIL, wxSTC_MARK_LCORNER, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDERSUB, wxSTC_MARK_VLINE, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS, "white", "black") + self.MarkerDefine(wxSTC_MARKNUM_FOLDEROPEN, wxSTC_MARK_BOXMINUS, "white", "black") EVT_STC_UPDATEUI(self, ID, self.OnUpdateUI) @@ -111,7 +128,7 @@ class PythonSTC(wxStyledTextCtrl): # Comment-blocks self.StyleSetSpec(wxSTC_P_COMMENTBLOCK, "fore:#7F7F7F,size:%(size)d" % faces) # End of line where string is not closed - self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eolfilled,size:%(size)d" % faces) + self.StyleSetSpec(wxSTC_P_STRINGEOL, "fore:#000000,face:%(mono)s,back:#E0C0E0,eol,size:%(size)d" % faces) self.SetCaretForeground("BLUE") @@ -120,6 +137,8 @@ class PythonSTC(wxStyledTextCtrl): def OnKeyPressed(self, event): + if self.CallTipActive(): + self.CallTipCancel() key = event.KeyCode() if key == 32 and event.ControlDown(): pos = self.GetCurrentPos() @@ -282,7 +301,7 @@ def runTest(frame, nb, log): if not _USE_PANEL: ed = p = PythonSTC(nb, -1) else: - p = wxPanel(nb, -1) + p = wxPanel(nb, -1, style = wxNO_FULL_REPAINT_ON_RESIZE) ed = PythonSTC(p, -1) s = wxBoxSizer(wxHORIZONTAL) s.Add(ed, 1, wxEXPAND) @@ -315,13 +334,9 @@ be helpful. if __name__ == '__main__': - import sys - app = wxPySimpleApp() - frame = wxFrame(None, -1, "Tester...", size=(640, 480)) - win = runTest(frame, frame, sys.stdout) - frame.Show(true) - app.MainLoop() - + import sys,os + import run + run.main(['', os.path.basename(sys.argv[0])])