fixes for several fatal problems when using wxComboCtrl as popup (patch 1539124)

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

diff --git a/wxPython/demo/CustomDragAndDrop.py b/wxPython/demo/CustomDragAndDrop.py
index 34570e1cf896722b3b15901c499985384dddbdcc..f5404cd4db509897e0e546c87a72a6f30a59f790 100644 (file)
--- a/wxPython/demo/CustomDragAndDrop.py
+++ b/wxPython/demo/CustomDragAndDrop.py
@@ -1,11 +1,3 @@
-# 11/5/2003 - Modified by grimmtooth@softhome.net (Jeff Grimmett)
-# 
-# o Updated for wx namespace
-#
-# 11/24/2003 - Modified by grimmtooth@softhome.net (Jeff Grimmett)
-# 
-# o Issues around line 167. I'm stuck.
-#

 
 import  cPickle
 import  wx
 
 import  cPickle
 import  wx


@@ -22,11 +14,11 @@ class DoodlePad(wx.Window):
         self.x = self.y = 0
         self.SetMode("Draw")
 
         self.x = self.y = 0
         self.SetMode("Draw")
 

-        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)
-        wx.EVT_PAINT(self, self.OnPaint)
+        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)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)

 
 
     def SetMode(self, mode):
 
 
     def SetMode(self, mode):


@@ -77,7 +69,7 @@ class DoodlePad(wx.Window):
             dc = wx.ClientDC(self)
             dc.BeginDrawing()
             dc.SetPen(wx.Pen(wx.BLUE, 3))
             dc = wx.ClientDC(self)
             dc.BeginDrawing()
             dc.SetPen(wx.Pen(wx.BLUE, 3))

-            coords = ((self.x, self.y), event.GetPositionTuple())
+            coords = (self.x, self.y) + event.GetPositionTuple()

             self.curLine.append(coords)
             dc.DrawLine(*coords)
             self.x, self.y = event.GetPositionTuple()
             self.curLine.append(coords)
             dc.DrawLine(*coords)
             self.x, self.y = event.GetPositionTuple()


@@ -90,7 +82,7 @@ class DoodlePad(wx.Window):
 
         # create our own data format and use it in a
         # custom data object
 
         # create our own data format and use it in a
         # custom data object

-        ldata = wx.CustomDataObject(wx.CustomDataFormat("DoodleLines"))
+        ldata = wx.CustomDataObject("DoodleLines")

         ldata.SetData(linesdata)
 
         # Also create a Bitmap version of the drawing
         ldata.SetData(linesdata)
 
         # Also create a Bitmap version of the drawing


@@ -133,8 +125,7 @@ class DoodleDropTarget(wx.PyDropTarget):
         self.dv = window
 
         # specify the type of data we will accept
         self.dv = window
 
         # specify the type of data we will accept

-        self.df = wx.CustomDataFormat("DoodleLines")
-        self.data = wx.CustomDataObject(self.df)
+        self.data = wx.CustomDataObject("DoodleLines")

         self.SetDataObject(self.data)
 
 
         self.SetDataObject(self.data)
 
 


@@ -191,7 +182,7 @@ class DoodleViewer(wx.Window):
         self.x = self.y = 0
         dt = DoodleDropTarget(self, log)
         self.SetDropTarget(dt)
         self.x = self.y = 0
         dt = DoodleDropTarget(self, log)
         self.SetDropTarget(dt)

-        wx.EVT_PAINT(self, self.OnPaint)
+        self.Bind(wx.EVT_PAINT, self.OnPaint)

 
 
     def SetLines(self, lines):
 
 
     def SetLines(self, lines):


@@ -224,8 +215,8 @@ class CustomDnDPanel(wx.Panel):
                             "Draw a little picture in this window\n"
                             "then switch the mode below and drag the\n"
                             "picture to the lower window or to another\n"
                             "Draw a little picture in this window\n"
                             "then switch the mode below and drag the\n"
                             "picture to the lower window or to another\n"

-                            "application that accepts BMP's as a drop\n"
-                             "target.\n"
+                            "application that accepts Bitmaps as a\n"
+                             "drop target.\n"

                             )
 
         rb1 = wx.RadioButton(self, -1, "Draw", style=wx.RB_GROUP)
                             )
 
         rb1 = wx.RadioButton(self, -1, "Draw", style=wx.RB_GROUP)


@@ -265,8 +256,8 @@ class CustomDnDPanel(wx.Panel):
         self.SetSizer(sizer)
 
         # Events
         self.SetSizer(sizer)
 
         # Events

-        wx.EVT_RADIOBUTTON(self, rb1.GetId(), self.OnRadioButton)
-        wx.EVT_RADIOBUTTON(self, rb2.GetId(), self.OnRadioButton)
+        self.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton, rb1)
+        self.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton, rb2)

 
 
     def OnRadioButton(self, evt):
 
 
     def OnRadioButton(self, evt):


@@ -323,11 +314,11 @@ if __name__ == '__main__':
         def MakeFrame(self, event=None):
             frame = wx.Frame(None, -1, "Custom Drag and Drop", size=(550,400))
             menu = wx.Menu()
         def MakeFrame(self, event=None):
             frame = wx.Frame(None, -1, "Custom Drag and Drop", size=(550,400))
             menu = wx.Menu()

-            menu.Append(6543, "Window")
+            item = menu.Append(-1, "Window")

             mb = wx.MenuBar()
             mb.Append(menu, "New")
             frame.SetMenuBar(mb)
             mb = wx.MenuBar()
             mb.Append(menu, "New")
             frame.SetMenuBar(mb)

-            wx.EVT_MENU(frame, 6543, self.MakeFrame)
+            frame.Bind(wx.EVT_MENU, self.MakeFrame, item)

             panel = TestPanel(frame, DummyLog())
             frame.Show(True)
             self.SetTopWindow(frame)
             panel = TestPanel(frame, DummyLog())
             frame.Show(True)
             self.SetTopWindow(frame)