A way to make the DC classes in wxPython look like the ones in 2.5, so

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

diff --git a/wxPython/demo/CustomDragAndDrop.py b/wxPython/demo/CustomDragAndDrop.py
index eb33d57f3db0f7cbc97ea01f314f475b7decbd53..b1c1e5a890df6ed0d8f03631091ca00584cdf8a9 100644 (file)
--- a/wxPython/demo/CustomDragAndDrop.py
+++ b/wxPython/demo/CustomDragAndDrop.py
@@ -1,66 +1,77 @@
 
 

-from wxPython.wx import *
-
-import cPickle
+import  cPickle
+import  wx

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

-class DoodlePad(wxWindow):
+class DoodlePad(wx.Window):

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxWindow.__init__(self, parent, -1, style=wxSUNKEN_BORDER)
+        wx.Window.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)

         self.log = log
         self.log = log

-        self.SetBackgroundColour(wxWHITE)
+        self.SetBackgroundColour(wx.WHITE)

         self.lines = []
         self.x = self.y = 0
         self.lines = []
         self.x = self.y = 0

-        self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
+        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)

 
 

-        EVT_LEFT_DOWN(self, self.OnLeftDown)
-        EVT_LEFT_UP(self, self.OnLeftUp)
-        EVT_RIGHT_UP(self, self.OnRightUp)
-        EVT_MOTION(self, self.OnMotion)
-        EVT_PAINT(self, self.OnPaint)
+
+    def SetMode(self, mode):
+        self.mode = mode
+        if self.mode == "Draw":
+            self.SetCursor(wx.StockCursor(wx.CURSOR_PENCIL))
+        else:
+            self.SetCursor(wx.STANDARD_CURSOR)

 
 
     def OnPaint(self, event):
 
 
     def OnPaint(self, event):

-        dc = wxPaintDC(self)
+        dc = wx.PaintDC(self)

         self.DrawSavedLines(dc)
 
     def DrawSavedLines(self, dc):
         dc.BeginDrawing()
         self.DrawSavedLines(dc)
 
     def DrawSavedLines(self, dc):
         dc.BeginDrawing()

-        dc.SetPen(wxPen(wxBLUE, 3))
+        dc.SetPen(wx.Pen(wx.BLUE, 3))

         for line in self.lines:
             for coords in line:
         for line in self.lines:
             for coords in line:

-                apply(dc.DrawLine, coords)
+                dc.DrawLine(*coords)

         dc.EndDrawing()
 
 
     def OnLeftDown(self, event):
         dc.EndDrawing()
 
 
     def OnLeftDown(self, event):

-        if event.ControlDown():
+        if self.mode == "Drag":

             self.StartDragOpperation()
             self.StartDragOpperation()

-        else:
+        elif self.mode == "Draw":

             self.curLine = []
             self.x, self.y = event.GetPositionTuple()
             self.CaptureMouse()
             self.curLine = []
             self.x, self.y = event.GetPositionTuple()
             self.CaptureMouse()

+        else:
+            wx.Bell()
+            self.log.write("unknown mode!\n")

 
 
     def OnLeftUp(self, event):
 
 
     def OnLeftUp(self, event):

-        self.lines.append(self.curLine)
-        self.curLine = []
-        self.ReleaseMouse()
+        if self.HasCapture():
+            self.lines.append(self.curLine)
+            self.curLine = []
+            self.ReleaseMouse()

 
     def OnRightUp(self, event):
         self.lines = []
         self.Refresh()
 
     def OnMotion(self, event):
 
     def OnRightUp(self, event):
         self.lines = []
         self.Refresh()
 
     def OnMotion(self, event):

-        if event.Dragging() and not event.ControlDown():
-            dc = wxClientDC(self)
+        if self.HasCapture() and event.Dragging() and not self.mode == "Drag":
+            dc = wx.ClientDC(self)

             dc.BeginDrawing()
             dc.BeginDrawing()

-            dc.SetPen(wxPen(wxBLUE, 3))
-            coords = (self.x, self.y) + event.GetPositionTuple()
+            dc.SetPen(wx.Pen(wx.BLUE, 3))
+            coords = ((self.x, self.y), event.GetPositionTuple())

             self.curLine.append(coords)
             self.curLine.append(coords)

-            apply(dc.DrawLine, coords)
+            dc.DrawLine(*coords)

             self.x, self.y = event.GetPositionTuple()
             dc.EndDrawing()
 
             self.x, self.y = event.GetPositionTuple()
             dc.EndDrawing()
 


@@ -71,158 +82,211 @@ class DoodlePad(wxWindow):
 
         # 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 = wxCustomDataObject(wxCustomDataFormat("DoodleLines"))
+        ldata = wx.CustomDataObject(wx.CustomDataFormat("DoodleLines"))

         ldata.SetData(linesdata)
 
         # Also create a Bitmap version of the drawing
         size = self.GetSize()
         ldata.SetData(linesdata)
 
         # Also create a Bitmap version of the drawing
         size = self.GetSize()

-        bmp = wxEmptyBitmap(size.width, size.height)
-        dc = wxMemoryDC()
+        bmp = wx.EmptyBitmap(size.width, size.height)
+        dc = wx.MemoryDC()

         dc.SelectObject(bmp)
         dc.SelectObject(bmp)

-        dc.SetBackground(wxWHITE_BRUSH)
+        dc.SetBackground(wx.WHITE_BRUSH)

         dc.Clear()
         self.DrawSavedLines(dc)
         dc.Clear()
         self.DrawSavedLines(dc)

-        dc.SelectObject(wxNullBitmap)
+        dc.SelectObject(wx.NullBitmap)

 
         # Now make a data object for the bitmap and also a composite
         # data object holding both of the others.
 
         # Now make a data object for the bitmap and also a composite
         # data object holding both of the others.

-        bdata = wxBitmapDataObject(bmp)
-        data = wxDataObjectComposite()
+        bdata = wx.BitmapDataObject(bmp)
+        data = wx.DataObjectComposite()

         data.Add(ldata)
         data.Add(bdata)
 
         # And finally, create the drop source and begin the drag
         # and drop opperation
         data.Add(ldata)
         data.Add(bdata)
 
         # And finally, create the drop source and begin the drag
         # and drop opperation

-        dropSource = wxDropSource(self)
+        dropSource = wx.DropSource(self)

         dropSource.SetData(data)
         self.log.WriteText("Begining DragDrop\n")
         dropSource.SetData(data)
         self.log.WriteText("Begining DragDrop\n")

-        result = dropSource.DoDragDrop()
+        result = dropSource.DoDragDrop(wx.Drag_AllowMove)

         self.log.WriteText("DragDrop completed: %d\n" % result)
 
         self.log.WriteText("DragDrop completed: %d\n" % result)
 

+        if result == wx.DragMove:
+            self.lines = []
+            self.Refresh()

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

-class DoodleDropTarget(wxPyDropTarget):
+class DoodleDropTarget(wx.PyDropTarget):

     def __init__(self, window, log):
     def __init__(self, window, log):

-        wxPyDropTarget.__init__(self)
+        wx.PyDropTarget.__init__(self)

         self.log = log
         self.dv = window
 
         # specify the type of data we will accept
         self.log = log
         self.dv = window
 
         # specify the type of data we will accept

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

         self.SetDataObject(self.data)
 
 
     # some virtual methods that track the progress of the drag
     def OnEnter(self, x, y, d):
         self.log.WriteText("OnEnter: %d, %d, %d\n" % (x, y, d))
         self.SetDataObject(self.data)
 
 
     # some virtual methods that track the progress of the drag
     def OnEnter(self, x, y, d):
         self.log.WriteText("OnEnter: %d, %d, %d\n" % (x, y, d))

-        return wxDragCopy
+        return d
+

     def OnLeave(self):
         self.log.WriteText("OnLeave\n")
     def OnLeave(self):
         self.log.WriteText("OnLeave\n")

+

     def OnDrop(self, x, y):
         self.log.WriteText("OnDrop: %d %d\n" % (x, y))
     def OnDrop(self, x, y):
         self.log.WriteText("OnDrop: %d %d\n" % (x, y))

-        return true
-    #def OnDragOver(self, x, y, d):
-    #    self.log.WriteText("OnDragOver: %d, %d, %d\n" % (x, y, d))
-    #    return wxDragCopy
+        return True
+
+    def OnDragOver(self, x, y, d):
+        #self.log.WriteText("OnDragOver: %d, %d, %d\n" % (x, y, d))
+
+        # The value returned here tells the source what kind of visual
+        # feedback to give.  For example, if wxDragCopy is returned then
+        # only the copy cursor will be shown, even if the source allows
+        # moves.  You can use the passed in (x,y) to determine what kind
+        # of feedback to give.  In this case we return the suggested value
+        # which is based on whether the Ctrl key is pressed.
+        return d
+

 
 
 
 

-    # Called when OnDrop returns true.  We need to get the data and
+    # Called when OnDrop returns True.  We need to get the data and

     # do something with it.
     def OnData(self, x, y, d):
         self.log.WriteText("OnData: %d, %d, %d\n" % (x, y, d))
 
     # do something with it.
     def OnData(self, x, y, d):
         self.log.WriteText("OnData: %d, %d, %d\n" % (x, y, d))
 

-        # copy the data from the drag source to out data object
+        # copy the data from the drag source to our data object

         if self.GetData():
             # convert it back to a list of lines and give it to the viewer
             linesdata = self.data.GetData()
             lines = cPickle.loads(linesdata)
             self.dv.SetLines(lines)
         if self.GetData():
             # convert it back to a list of lines and give it to the viewer
             linesdata = self.data.GetData()
             lines = cPickle.loads(linesdata)
             self.dv.SetLines(lines)

-        return d
-
+            
+        # what is returned signals the source what to do
+        # with the original data (move, copy, etc.)  In this
+        # case we just return the suggested value given to us.
+        return d  
+        

 
 
 
 

-
-class DoodleViewer(wxWindow):
+class DoodleViewer(wx.Window):

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxWindow.__init__(self, parent, -1, style=wxSUNKEN_BORDER)
+        wx.Window.__init__(self, parent, -1, style=wx.SUNKEN_BORDER)

         self.log = log
         self.log = log

-        self.SetBackgroundColour(wxWHITE)
+        self.SetBackgroundColour(wx.WHITE)

         self.lines = []
         self.x = self.y = 0
         dt = DoodleDropTarget(self, log)
         self.SetDropTarget(dt)
         self.lines = []
         self.x = self.y = 0
         dt = DoodleDropTarget(self, log)
         self.SetDropTarget(dt)

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

 
     def SetLines(self, lines):
         self.lines = lines
         self.Refresh()
 
     def OnPaint(self, event):
 
     def SetLines(self, lines):
         self.lines = lines
         self.Refresh()
 
     def OnPaint(self, event):

-        dc = wxPaintDC(self)
+        dc = wx.PaintDC(self)

         self.DrawSavedLines(dc)
 
     def DrawSavedLines(self, dc):
         dc.BeginDrawing()
         self.DrawSavedLines(dc)
 
     def DrawSavedLines(self, dc):
         dc.BeginDrawing()

-        dc.SetPen(wxPen(wxRED, 3))
+        dc.SetPen(wx.Pen(wx.RED, 3))
+

         for line in self.lines:
             for coords in line:
         for line in self.lines:
             for coords in line:

-                apply(dc.DrawLine, coords)
+                dc.DrawLine(*coords)

         dc.EndDrawing()
 
 #----------------------------------------------------------------------
 
         dc.EndDrawing()
 
 #----------------------------------------------------------------------
 

-class CustomDnDPanel(wxPanel):
+class CustomDnDPanel(wx.Panel):

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

 
 

-        self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
+        self.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.BOLD, False))

 
 

-        sizer = wxBoxSizer(wxHORIZONTAL)
-        text = wxStaticText(self, -1,
+        # Make the controls
+        text1 = wx.StaticText(self, -1,

                             "Draw a little picture in this window\n"
                             "Draw a little picture in this window\n"

-                            "then Ctrl-Drag it to the lower \n"
-                            "window or to another application\n"
-                            "that accepts BMP's as a drop target.\n\n"
-                            "The lower window is accepting a\n"
-                            "custom data type that is a pickled\n"
-                            "Python list of lines data.")
-        sizer.Add(text, 1, wxALL, 10)
-
-        insizer = wxBoxSizer(wxVERTICAL)
-        insizer.Add(DoodlePad(self, log), 1, wxEXPAND|wxALL, 5)
-        insizer.Add(DoodleViewer(self, log), 1, wxEXPAND|wxALL, 5)
-
-        sizer.Add(insizer, 1, wxEXPAND)
-        self.SetAutoLayout(true)
+                            "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"
+                            )
+
+        rb1 = wx.RadioButton(self, -1, "Draw", style=wx.RB_GROUP)
+        rb1.SetValue(True)
+        rb2 = wx.RadioButton(self, -1, "Drag")
+        rb2.SetValue(False)
+
+        text2 = wx.StaticText(self, -1,
+                             "The lower window is accepting a\n"
+                             "custom data type that is a pickled\n"
+                             "Python list of lines data.")
+
+        self.pad = DoodlePad(self, log)
+        view = DoodleViewer(self, log)
+
+        # put them in sizers
+        sizer = wx.BoxSizer(wx.HORIZONTAL)
+        box = wx.BoxSizer(wx.VERTICAL)
+        rbox = wx.BoxSizer(wx.HORIZONTAL)
+
+        rbox.Add(rb1)
+        rbox.Add(rb2)
+        box.Add(text1, 0, wx.ALL, 10)
+        box.Add(rbox, 0, wx.ALIGN_CENTER)
+        box.Add((10,90))
+        box.Add(text2, 0, wx.ALL, 10)
+
+        sizer.Add(box)
+
+        dndsizer = wx.BoxSizer(wx.VERTICAL)
+        dndsizer.Add(self.pad, 1, wx.EXPAND|wx.ALL, 5)
+        dndsizer.Add(view, 1, wx.EXPAND|wx.ALL, 5)
+
+        sizer.Add(dndsizer, 1, wx.EXPAND)
+
+        self.SetAutoLayout(True)

         self.SetSizer(sizer)
 
         self.SetSizer(sizer)
 

+        # Events
+        wx.EVT_RADIOBUTTON(self, rb1.GetId(), self.OnRadioButton)
+        wx.EVT_RADIOBUTTON(self, rb2.GetId(), self.OnRadioButton)
+

 
 

+    def OnRadioButton(self, evt):
+        rb = self.FindWindowById(evt.GetId())
+        self.pad.SetMode(rb.GetLabel())

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

-class TestPanel(wxPanel):
+class TestPanel(wx.Panel):

     def __init__(self, parent, log):
     def __init__(self, parent, log):

-        wxPanel.__init__(self, parent, -1)
+        wx.Panel.__init__(self, parent, -1)

 
 

-        self.SetAutoLayout(true)
-        sizer = wxBoxSizer(wxVERTICAL)
+        self.SetAutoLayout(True)
+        sizer = wx.BoxSizer(wx.VERTICAL)

 
         msg = "Custom Drag-And-Drop"
 
         msg = "Custom Drag-And-Drop"

-        text = wxStaticText(self, -1, "", style=wxALIGN_CENTRE)
-        text.SetFont(wxFont(24, wxSWISS, wxNORMAL, wxBOLD, false))
+        text = wx.StaticText(self, -1, "", style=wx.ALIGN_CENTRE)
+        text.SetFont(wx.Font(24, wx.SWISS, wx.NORMAL, wx.BOLD, False))

         text.SetLabel(msg)
         w,h = text.GetTextExtent(msg)
         text.SetLabel(msg)
         w,h = text.GetTextExtent(msg)

-        text.SetSize(wxSize(w,h+1))
-        text.SetForegroundColour(wxBLUE)
-        sizer.Add(text, 0, wxEXPAND|wxALL, 5)
-        sizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
+        text.SetSize(wx.Size(w,h+1))
+        text.SetForegroundColour(wx.BLUE)
+        sizer.Add(text, 0, wx.EXPAND|wx.ALL, 5)
+        sizer.Add(wx.StaticLine(self, -1), 0, wx.EXPAND)

 
 

-        sizer.Add(CustomDnDPanel(self, log), 1, wxEXPAND)
+        sizer.Add(CustomDnDPanel(self, log), 1, wx.EXPAND)

 
         self.SetSizer(sizer)
 
 
         self.SetSizer(sizer)
 


@@ -230,34 +294,37 @@ class TestPanel(wxPanel):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):
 #----------------------------------------------------------------------
 
 def runTest(frame, nb, log):

-    win = TestPanel(nb, log)
+    #win = TestPanel(nb, log)
+    win = CustomDnDPanel(nb, log)

     return win
 
 
 if __name__ == '__main__':
     import sys
     return win
 
 
 if __name__ == '__main__':
     import sys

+    

     class DummyLog:
         def WriteText(self, text):
             sys.stdout.write(text)
 
     class DummyLog:
         def WriteText(self, text):
             sys.stdout.write(text)
 

-    class TestApp(wxApp):
+    class TestApp(wx.App):

         def OnInit(self):
         def OnInit(self):

+            wx.InitAllImageHandlers()

             self.MakeFrame()
             self.MakeFrame()

-            return true
+            return True

 
         def MakeFrame(self, event=None):
 
         def MakeFrame(self, event=None):

-            frame = wxFrame(None, -1, "Custom Drag and Drop", size=(550,400))
-            menu = wxMenu()
+            frame = wx.Frame(None, -1, "Custom Drag and Drop", size=(550,400))
+            menu = wx.Menu()

             menu.Append(6543, "Window")
             menu.Append(6543, "Window")

-            mb = wxMenuBar()
+            mb = wx.MenuBar()

             mb.Append(menu, "New")
             frame.SetMenuBar(mb)
             mb.Append(menu, "New")
             frame.SetMenuBar(mb)

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

             panel = TestPanel(frame, DummyLog())
             panel = TestPanel(frame, DummyLog())

-            frame.Show(true)
+            frame.Show(True)

             self.SetTopWindow(frame)
 
             self.SetTopWindow(frame)
 

-
+    #----------------------------------------------------------------------

 
     app = TestApp(0)
     app.MainLoop()
 
     app = TestApp(0)
     app.MainLoop()


@@ -265,21 +332,18 @@ if __name__ == '__main__':
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
 

+overview = """<html><body>
+This demo shows Drag and Drop using a custom data type and a custom
+data object.  A type called "DoodleLines" is created and a Python
+Pickle of a list is actually transfered in the drag and drop
+opperation.

 
 

+A second data object is also created containing a bitmap of the image
+and is made available to any drop target that accepts bitmaps, such as
+MS Word.

 
 

-
-
-
-
-
-
-
-
-overview = """\
-This demo shows Drag and Drop using a custom data type and a custom data object.  A type called "DoodleLines" is created and a Python Pickle of a list is actually transfered in the drag and drop opperation.
-
-A second data object is also created containing a bitmap of the image and is made available to any drop target that accepts bitmaps, such as MS Word.
-
-The two data objects are combined in a wxDataObjectComposite and the rest is handled by the framework.
+The two data objects are combined in a wx.DataObjectComposite and the
+rest is handled by the framework.
+</body></html>

 """
 
 """