X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4b73b1b8e585418459362c9bf9173aa21da8c41..d37da5efd58145835e493ba5763c924fb72d8a41:/wxPython/wx/lib/editor/editor.py diff --git a/wxPython/wx/lib/editor/editor.py b/wxPython/wx/lib/editor/editor.py index b3f4f1b155..d0a67cbeef 100644 --- a/wxPython/wx/lib/editor/editor.py +++ b/wxPython/wx/lib/editor/editor.py @@ -131,9 +131,12 @@ class Editor(wx.ScrolledWindow): def NiceFontForPlatform(self): if wx.Platform == "__WXMSW__": - return wx.Font(10, wx.MODERN, wx.NORMAL, wx.NORMAL) + font = wx.Font(10, wx.MODERN, wx.NORMAL, wx.NORMAL) else: - return wx.Font(12, wx.MODERN, wx.NORMAL, wx.NORMAL, False) + font = wx.Font(12, wx.MODERN, wx.NORMAL, wx.NORMAL, False) + if wx.Platform == "__WXMAC__": + font.SetNoAntiAliasing() + return font def UnixKeyHack(self, key): # @@ -213,7 +216,7 @@ class Editor(wx.ScrolledWindow): pass def DrawEditText(self, t, x, y, dc): - dc.DrawText(t, (x * self.fw, y * self.fh)) + dc.DrawText(t, x * self.fw, y * self.fh) def DrawLine(self, line, dc): if self.IsLine(line): @@ -261,7 +264,7 @@ class Editor(wx.ScrolledWindow): x = 0 y = (len(self.lines) - self.sy) * self.fh hasTransparency = 1 - dc.DrawBitmap(self.eofMarker, (x, y), hasTransparency) + dc.DrawBitmap(self.eofMarker, x, y, hasTransparency) ##------------------ cursor-related functions @@ -290,7 +293,7 @@ class Editor(wx.ScrolledWindow): szy = self.fh x = xp * szx y = yp * szy - dc.Blit((x,y), (szx,szy), dc, (x,y), wx.SRC_INVERT) + dc.Blit(x,y, szx,szy, dc, x,y, wx.SRC_INVERT) self.sco_x = xp self.sco_y = yp @@ -771,7 +774,7 @@ class Editor(wx.ScrolledWindow): def MoveLeft(self, event): if self.cx == 0: if self.cy == 0: - wxBell() + wx.Bell() else: self.cVert(-1) self.cx = self.CurrentLineLength() @@ -782,7 +785,7 @@ class Editor(wx.ScrolledWindow): linelen = self.CurrentLineLength() if self.cx == linelen: if self.cy == len(self.lines) - 1: - wxBell() + wx.Bell() else: self.cx = 0 self.cVert(1)