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

API and etc. updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-13 03:28:11 +00:00
parent 35095c028d
commit 2571247b80
5 changed files with 94 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
wxPython/samples/doodle/doodle.py
View File

@@ -38,26 +38,28 @@ class DoodleWindow(wx.Window):
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
wx.EVT_LEFT_DOWN(self, self.OnLeftDown)
wx.EVT_LEFT_UP(self, self.OnLeftUp)
wx.EVT_RIGHT_UP(self, self.OnRightUp)
wx.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
wx.EVT_SIZE(self, self.OnSize)
wx.EVT_IDLE(self, self.OnIdle)
self.Bind(wx.EVT_SIZE, self.OnSize)
self.Bind(wx.EVT_IDLE, self.OnIdle)
# and the refresh event
wx.EVT_PAINT(self, self.OnPaint)
self.Bind(wx.EVT_PAINT, self.OnPaint)
# When the window is destroyed, clean up resources.
wx.EVT_WINDOW_DESTROY(self, self.Cleanup)
self.Bind(wx.EVT_WINDOW_DESTROY, self.Cleanup)
def Cleanup(self, evt):
@@ -109,14 +111,15 @@ class DoodleWindow(wx.Window):
for k in keys:
text = self.menuColours[k]
menu.Append(k, text, kind=wx.ITEM_CHECK)
wx.EVT_MENU_RANGE(self, 100, 200, self.OnMenuSetColour)
wx.EVT_UPDATE_UI_RANGE(self, 100, 200, self.OnCheckMenuColours)
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=wx.ITEM_CHECK)
wx.EVT_MENU_RANGE(self, 1, self.maxThickness, self.OnMenuSetThickness)
wx.EVT_UPDATE_UI_RANGE(self, 1, self.maxThickness, self.OnCheckMenuThickness)
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
@@ -141,7 +144,7 @@ class DoodleWindow(wx.Window):
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()
@@ -170,11 +173,11 @@ class DoodleWindow(wx.Window):
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, pos)
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()
@@ -218,7 +221,7 @@ class DoodleWindow(wx.Window):
pen = wx.Pen(colour, thickness, wx.SOLID)
dc.SetPen(pen)
for coords in line:
apply(dc.DrawLine, coords)
dc.DrawLine(*coords)
dc.EndDrawing()

20
wxPython/samples/doodle/superdoodle.py
View File

@@ -107,12 +107,12 @@ class DoodleFrame(wx.Frame):
menuBar.Append(menu2, "&Help")
self.SetMenuBar(menuBar)
wx.EVT_MENU(self, idOPEN, self.OnMenuOpen)
wx.EVT_MENU(self, idSAVE, self.OnMenuSave)
wx.EVT_MENU(self, idSAVEAS, self.OnMenuSaveAs)
wx.EVT_MENU(self, idCLEAR, self.OnMenuClear)
wx.EVT_MENU(self, idEXIT, self.OnMenuExit)
wx.EVT_MENU(self, idABOUT, self.OnMenuAbout)
self.Bind(wx.EVT_MENU, self.OnMenuOpen, id=idOPEN)
self.Bind(wx.EVT_MENU, self.OnMenuSave, id=idSAVE)
self.Bind(wx.EVT_MENU, self.OnMenuSaveAs, id=idSAVEAS)
self.Bind(wx.EVT_MENU, self.OnMenuClear, id=idCLEAR)
self.Bind(wx.EVT_MENU, self.OnMenuExit, id=idEXIT)
self.Bind(wx.EVT_MENU, self.OnMenuAbout, id=idABOUT)
@@ -202,7 +202,7 @@ class ControlPanel(wx.Panel):
b = buttons.GenBitmapToggleButton(self, k, bmp, size=btnSize )
b.SetBezelWidth(1)
b.SetUseFocusIndicator(False)
wx.EVT_BUTTON(self, k, self.OnSetColour)
self.Bind(wx.EVT_BUTTON, self.OnSetColour, b)
cGrid.Add(b, 0)
self.clrBtns[colours[k]] = b
self.clrBtns[colours[keys[0]]].SetToggle(True)
@@ -217,7 +217,7 @@ class ControlPanel(wx.Panel):
b = buttons.GenToggleButton(self, x, str(x), size=btnSize)
b.SetBezelWidth(1)
b.SetUseFocusIndicator(False)
wx.EVT_BUTTON(self, x, self.OnSetThickness)
self.Bind(wx.EVT_BUTTON, self.OnSetThickness, b)
tGrid.Add(b, 0)
self.thknsBtns[x] = b
self.thknsBtns[1].SetToggle(True)
@@ -297,7 +297,7 @@ class ColourIndicator(wx.Window):
self.SetBackgroundColour(wx.WHITE)
self.SetSize( (-1, 45) )
self.colour = self.thickness = None
wx.EVT_PAINT(self, self.OnPaint)
self.Bind(wx.EVT_PAINT, self.OnPaint)
def Update(self, colour, thickness):
@@ -321,7 +321,7 @@ class ColourIndicator(wx.Window):
pen = wx.Pen(self.colour, self.thickness)
dc.BeginDrawing()
dc.SetPen(pen)
dc.DrawLine(10, sz.height/2, sz.width-10, sz.height/2)
dc.DrawLine((10, sz.height/2), (sz.width-10, sz.height/2))
dc.EndDrawing()