Add GetOwner accessor and fix wxRTTI inheritance for wxTimer. Set the

[wxWidgets.git] / wxPython / demo / Cursor.py

diff --git a/wxPython/demo/Cursor.py b/wxPython/demo/Cursor.py
index 301a84d99b09e5fb96debdeda4357ecb369d926b..29b7f9c7ea2d3eaaaee0677b45d749fb01fb8087 100644 (file)
--- a/wxPython/demo/Cursor.py
+++ b/wxPython/demo/Cursor.py
@@ -51,27 +51,27 @@ class TestPanel(wx.Panel):
         choices.sort()
 
         # create the controls
         choices.sort()
 
         # create the controls

-        self.ch = wx.Choice(self, -1, choices=choices)
-        self.ch.SetStringSelection("wx.CURSOR_DEFAULT")
+        self.cb = wx.ComboBox(self, -1, "wx.CURSOR_DEFAULT", choices=choices,
+                              style=wx.CB_READONLY)

         self.tx = wx.StaticText(self, -1,                                
              "This sample allows you to see all the stock cursors \n"
              "available to wxPython.  Simply select a name from the \n"
         self.tx = wx.StaticText(self, -1,                                
              "This sample allows you to see all the stock cursors \n"
              "available to wxPython.  Simply select a name from the \n"

-             "wx.Choice and then move the mouse into the dineo below \n"
-             "to see the cursor.  NOTE: not all stock cursors have a \n"
-             "specific representaion on all platforms.")
+             "wx.Choice and then move the mouse into the window \n"
+             "below to see the cursor.  NOTE: not all stock cursors \n"
+             "have a specific representaion on all platforms.")

         
         self.win = wx.Window(self, -1, size=(200,200), style=wx.SIMPLE_BORDER)
         self.win.SetBackgroundColour("white")
 
         # bind an event or two
         
         self.win = wx.Window(self, -1, size=(200,200), style=wx.SIMPLE_BORDER)
         self.win.SetBackgroundColour("white")
 
         # bind an event or two

-        self.Bind(wx.EVT_CHOICE, self.OnChooseCursor, self.ch)
+        self.Bind(wx.EVT_COMBOBOX, self.OnChooseCursor, self.cb)

         self.win.Bind(wx.EVT_LEFT_DOWN, self.OnDrawDot)
         
 
         # Setup the layout
         gbs = wx.GridBagSizer()
         self.win.Bind(wx.EVT_LEFT_DOWN, self.OnDrawDot)
         
 
         # Setup the layout
         gbs = wx.GridBagSizer()

-        gbs.Add(self.ch, (2,2))
-        gbs.Add(self.tx, (2,4))
+        gbs.Add(self.cb, (2,1))
+        gbs.Add(self.tx, (2,3))

         gbs.Add(self.win, (5,0), (1, 6), wx.ALIGN_CENTER)
         self.SetSizer(gbs)
 
         gbs.Add(self.win, (5,0), (1, 6), wx.ALIGN_CENTER)
         self.SetSizer(gbs)
 


@@ -80,7 +80,7 @@ class TestPanel(wx.Panel):
         # clear the dots
         self.win.Refresh()
         
         # clear the dots
         self.win.Refresh()
         

-        choice = self.ch.GetStringSelection()
+        choice = self.cb.GetStringSelection()

         self.log.write("Selecting the %s cursor\n" % choice)
 
         cnum = cursors[choice]
         self.log.write("Selecting the %s cursor\n" % choice)
 
         cnum = cursors[choice]


@@ -109,7 +109,8 @@ class TestPanel(wx.Panel):
         dc = wx.ClientDC(self.win)
         dc.SetPen(wx.Pen("RED"))
         dc.SetBrush(wx.Brush("RED"))
         dc = wx.ClientDC(self.win)
         dc.SetPen(wx.Pen("RED"))
         dc.SetBrush(wx.Brush("RED"))

-        dc.DrawCircle(evt.GetPosition(), 4)
+        pos = evt.GetPosition()
+        dc.DrawCircle(pos.x, pos.y, 4)

         
 
 #----------------------------------------------------------------------
         
 
 #----------------------------------------------------------------------


@@ -135,5 +136,5 @@ This demo shows the stock mouse cursors that are available to wxPython.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])