odds and ends...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/demo/GridSimple.py

@@ -71,6 +71,7 @@ class SimpleGrid(wxGrid, wxGridAutoEditMixin):
         EVT_GRID_EDITOR_CREATED(self, self.OnEditorCreated)
 
 
+
     def OnCellLeftClick(self, evt):
         self.log.write("OnCellLeftClick: (%d,%d) %s\n" %
                        (evt.GetRow(), evt.GetCol(), evt.GetPosition()))

wxPython/demo/XMLtreeview.py

@@ -32,6 +32,39 @@ else:
             wxTreeCtrl.__init__(self, parent, ID)
             self.nodeStack = [self.AddRoot("Root")]
 
+            # Trees need an image list to do DnD...
+            self.il = wxImageList(16,16)
+            self.SetImageList(self.il)
+
+            # event handlers for DnD
+            EVT_TREE_BEGIN_DRAG(self, ID, self.OnBeginDrag)
+            EVT_TREE_END_DRAG(self, ID, self.OnEndDrag)
+
+
+        def OnBeginDrag(self, event):
+            item = event.GetItem()
+            if item != self.GetRootItem():
+                self.draggingItem = item
+                event.Allow()  # if DnD of this item is okay Allow it.
+
+
+        def OnEndDrag(self, evt):
+            itemSrc = self.draggingItem
+            itemDst = evt.GetItem()
+            self.draggingItem = None
+
+            if not itemDst.IsOk():
+                print "Can't drag to here..."
+                return
+
+            # For this simple example just take the text of the source item
+            # and append it to the destination item.  In real life you would
+            # possibly want to copy subtrees...
+            text = self.GetItemText(itemSrc)
+            self.AppendItem(itemDst, text)
+            self.Delete(itemSrc)
+
+
         # Define a handler for start element events
         def StartElement(self, name, attrs ):
             if py2:

wxPython/demo/wxFrame.py

@@ -4,8 +4,9 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class MyFrame(wxFrame):
-    def __init__(self, parent, ID, title, pos, size):
-        wxFrame.__init__(self, parent, ID, title, pos, size)
+    def __init__(self, parent, ID, title, pos=wxDefaultPosition,
+                 size=wxDefaultSize, style=wxDEFAULT_FRAME_STYLE):
+        wxFrame.__init__(self, parent, ID, title, pos, size, style)
         panel = wxPanel(self, -1)
 
         button = wxButton(panel, 1003, "Close Me")
@@ -23,7 +24,8 @@ class MyFrame(wxFrame):
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
-    win = MyFrame(frame, -1, "This is a wxFrame", wxDefaultPosition, wxSize(350, 200))
+    win = MyFrame(frame, -1, "This is a wxFrame", size=(350, 200),
+                  style = wxDEFAULT_FRAME_STYLE |  wxFRAME_TOOL_WINDOW )
     frame.otherWin = win
     win.Show(true)
 

wxPython/demo/wxStyledTextCtrl_2.py

@@ -12,7 +12,7 @@ demoText = """\
 
 
 """
-wxSTC_CMD_ZOOMIN
+
 #----------------------------------------------------------------------