"""
-from wxPython.wx import *
+import wx # This module uses the new wx namespace
#----------------------------------------------------------------------
-class DoodleWindow(wxWindow):
+class DoodleWindow(wx.Window):
menuColours = { 100 : 'Black',
101 : 'Yellow',
102 : 'Red',
def __init__(self, parent, ID):
- wxWindow.__init__(self, parent, ID, style=wxNO_FULL_REPAINT_ON_RESIZE)
+ wx.Window.__init__(self, parent, ID, style=wx.NO_FULL_REPAINT_ON_RESIZE)
self.SetBackgroundColour("WHITE")
self.listeners = []
self.thickness = 1
self.SetColour("Black")
self.lines = []
- self.x = self.y = 0
+ self.pos = wx.Point(0,0)
self.MakeMenu()
self.InitBuffer()
+ self.SetCursor(wx.StockCursor(wx.CURSOR_PENCIL))
+
# hook some mouse events
- EVT_LEFT_DOWN(self, self.OnLeftDown)
- EVT_LEFT_UP(self, self.OnLeftUp)
- EVT_RIGHT_UP(self, self.OnRightUp)
- EVT_MOTION(self, self.OnMotion)
+ self.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
+ self.Bind(wx.EVT_LEFT_UP, self.OnLeftUp)
+ self.Bind(wx.EVT_RIGHT_UP, self.OnRightUp)
+ self.Bind(wx.EVT_MOTION, self.OnMotion)
# the window resize event and idle events for managing the buffer
- EVT_SIZE(self, self.OnSize)
- EVT_IDLE(self, self.OnIdle)
+ self.Bind(wx.EVT_SIZE, self.OnSize)
+ self.Bind(wx.EVT_IDLE, self.OnIdle)
# and the refresh event
- EVT_PAINT(self, self.OnPaint)
+ self.Bind(wx.EVT_PAINT, self.OnPaint)
# When the window is destroyed, clean up resources.
- EVT_WINDOW_DESTROY(self, self.Cleanup)
+ self.Bind(wx.EVT_WINDOW_DESTROY, self.Cleanup)
def Cleanup(self, evt):
def InitBuffer(self):
"""Initialize the bitmap used for buffering the display."""
size = self.GetClientSize()
- self.buffer = wxEmptyBitmap(size.width, size.height)
- dc = wxBufferedDC(None, self.buffer)
- dc.SetBackground(wxBrush(self.GetBackgroundColour()))
+ self.buffer = wx.EmptyBitmap(max(1,size.width), max(1,size.height))
+ dc = wx.BufferedDC(None, self.buffer)
+ dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
dc.Clear()
self.DrawLines(dc)
self.reInitBuffer = False
def SetColour(self, colour):
"""Set a new colour and make a matching pen"""
self.colour = colour
- self.pen = wxPen(wxNamedColour(self.colour), self.thickness, wxSOLID)
+ self.pen = wx.Pen(self.colour, self.thickness, wx.SOLID)
self.Notify()
def SetThickness(self, num):
"""Set a new line thickness and make a matching pen"""
self.thickness = num
- self.pen = wxPen(wxNamedColour(self.colour), self.thickness, wxSOLID)
+ self.pen = wx.Pen(self.colour, self.thickness, wx.SOLID)
self.Notify()
def MakeMenu(self):
"""Make a menu that can be popped up later"""
- menu = wxMenu()
+ menu = wx.Menu()
keys = self.menuColours.keys()
keys.sort()
for k in keys:
text = self.menuColours[k]
- menu.Append(k, text, kind=wxITEM_CHECK)
- EVT_MENU_RANGE(self, 100, 200, self.OnMenuSetColour)
- EVT_UPDATE_UI_RANGE(self, 100, 200, self.OnCheckMenuColours)
+ menu.Append(k, text, kind=wx.ITEM_CHECK)
+ self.Bind(wx.EVT_MENU_RANGE, self.OnMenuSetColour, id=100, id2=200)
+ self.Bind(wx.EVT_UPDATE_UI_RANGE, self.OnCheckMenuColours, id=100, id2=200)
menu.Break()
for x in range(1, self.maxThickness+1):
- menu.Append(x, str(x), kind=wxITEM_CHECK)
- EVT_MENU_RANGE(self, 1, self.maxThickness, self.OnMenuSetThickness)
- EVT_UPDATE_UI_RANGE(self, 1, self.maxThickness, self.OnCheckMenuThickness)
+ menu.Append(x, str(x), kind=wx.ITEM_CHECK)
+
+ self.Bind(wx.EVT_MENU_RANGE, self.OnMenuSetThickness, id=1, id2=self.maxThickness)
+ self.Bind(wx.EVT_UPDATE_UI_RANGE, self.OnCheckMenuThickness, id=1, id2=self.maxThickness)
self.menu = menu
text = self.menuColours[event.GetId()]
if text == self.colour:
event.Check(True)
+ event.SetText(text.upper())
else:
event.Check(False)
+ event.SetText(text)
+
def OnCheckMenuThickness(self, event):
if event.GetId() == self.thickness:
event.Check(True)
def OnLeftDown(self, event):
"""called when the left mouse button is pressed"""
self.curLine = []
- self.x, self.y = event.GetPositionTuple()
+ self.pos = event.GetPosition()
self.CaptureMouse()
current one. Save the coordinants for redraws.
"""
if event.Dragging() and event.LeftIsDown():
- dc = wxBufferedDC(wxClientDC(self), self.buffer)
+ dc = wx.BufferedDC(wx.ClientDC(self), self.buffer)
dc.BeginDrawing()
dc.SetPen(self.pen)
- pos = event.GetPositionTuple()
- coords = (self.x, self.y) + pos
+ pos = event.GetPosition()
+ coords = (self.pos.x, self.pos.y, pos.x, pos.y)
self.curLine.append(coords)
- dc.DrawLine(self.x, self.y, pos[0], pos[1])
- self.x, self.y = pos
+ dc.DrawLine(*coords)
+ self.pos = pos
dc.EndDrawing()
Called when the window is exposed.
"""
# Create a buffered paint DC. It will create the real
- # wxPaintDC and then blit the bitmap to it when dc is
+ # wx.PaintDC and then blit the bitmap to it when dc is
# deleted. Since we don't need to draw anything else
# here that's all there is to it.
- dc = wxBufferedPaintDC(self, self.buffer)
+ dc = wx.BufferedPaintDC(self, self.buffer)
def DrawLines(self, dc):
"""
dc.BeginDrawing()
for colour, thickness, line in self.lines:
- pen = wxPen(wxNamedColour(colour), thickness, wxSOLID)
+ pen = wx.Pen(colour, thickness, wx.SOLID)
dc.SetPen(pen)
for coords in line:
- apply(dc.DrawLine, coords)
+ dc.DrawLine(*coords)
dc.EndDrawing()
#----------------------------------------------------------------------
-class DoodleFrame(wxFrame):
+class DoodleFrame(wx.Frame):
def __init__(self, parent):
- wxFrame.__init__(self, parent, -1, "Doodle Frame", size=(800,600),
- style=wxDEFAULT_FRAME_STYLE | wxNO_FULL_REPAINT_ON_RESIZE)
+ wx.Frame.__init__(self, parent, -1, "Doodle Frame", size=(800,600),
+ style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
doodle = DoodleWindow(self, -1)
#----------------------------------------------------------------------
if __name__ == '__main__':
- app = wxPySimpleApp()
+ app = wx.PySimpleApp()
frame = DoodleFrame(None)
frame.Show(True)
app.MainLoop()
projects / wxWidgets.git / blobdiff