little demo updates

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

diff --git a/wxPython/demo/CustomDragAndDrop.py b/wxPython/demo/CustomDragAndDrop.py
index fd416a29b7c816b3024fa3fc4efcc4586a7bfa33..46c3ed5240f0af310b615c943b07bb87ff01aef8 100644 (file)
--- a/wxPython/demo/CustomDragAndDrop.py
+++ b/wxPython/demo/CustomDragAndDrop.py
@@ -107,7 +107,7 @@ class DoodlePad(wxWindow):
         dropSource = wxDropSource(self)
         dropSource.SetData(data)
         self.log.WriteText("Begining DragDrop\n")
         dropSource = wxDropSource(self)
         dropSource.SetData(data)
         self.log.WriteText("Begining DragDrop\n")

-        result = dropSource.DoDragDrop(true)
+        result = dropSource.DoDragDrop(wxDrag_AllowMove)

         self.log.WriteText("DragDrop completed: %d\n" % result)
         if result == wxDragMove:
             self.lines = []
         self.log.WriteText("DragDrop completed: %d\n" % result)
         if result == wxDragMove:
             self.lines = []

diff --git a/wxPython/demo/wxGLCanvas.py b/wxPython/demo/wxGLCanvas.py
index 2fff582751da809d4b610bdd196851736abdbd98..0374cf50ef3e70fccac5e4ac6181005f61234cb6 100644 (file)
--- a/wxPython/demo/wxGLCanvas.py
+++ b/wxPython/demo/wxGLCanvas.py
@@ -85,9 +85,9 @@ else:
             EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
             EVT_SIZE(self, self.OnSize)
             EVT_PAINT(self, self.OnPaint)
             EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
             EVT_SIZE(self, self.OnSize)
             EVT_PAINT(self, self.OnPaint)

-            #EVT_LEFT_DOWN(self, self.OnMouseDown)  # needs fixing...
-            #EVT_LEFT_UP(self, self.OnMouseUp)
-            #EVT_MOTION(self, self.OnMouseMotion)
+            EVT_LEFT_DOWN(self, self.OnMouseDown)  # needs fixing...
+            EVT_LEFT_UP(self, self.OnMouseUp)
+            EVT_MOTION(self, self.OnMouseMotion)

 
         def OnEraseBackground(self, event):
             pass # Do nothing, to avoid flashing on MSW.
 
         def OnEraseBackground(self, event):
             pass # Do nothing, to avoid flashing on MSW.


@@ -116,7 +116,7 @@ else:
             if evt.Dragging() and evt.LeftIsDown():
                 self.x, self.y = self.lastx, self.lasty
                 self.x, self.y = evt.GetPosition()
             if evt.Dragging() and evt.LeftIsDown():
                 self.x, self.y = self.lastx, self.lasty
                 self.x, self.y = evt.GetPosition()

-                self.Refresh()
+                self.Refresh(false)

 
 
 
 
 
 

diff --git a/wxPython/demo/wxStaticText.py b/wxPython/demo/wxStaticText.py
index 6d047bd0e76c7be4b073258bbd52f06e6ab001eb..ff3d3c70eea7184eb4cdf46ba230368333f419e9 100644 (file)
--- a/wxPython/demo/wxStaticText.py
+++ b/wxPython/demo/wxStaticText.py
@@ -14,7 +14,7 @@ class TestPanel(wxPanel):
                      wxPoint(20, 30))
 
         wxStaticText(self, -1, "Is this yellow?",
                      wxPoint(20, 30))
 
         wxStaticText(self, -1, "Is this yellow?",

-                     wxPoint(20, 70)).SetBackgroundColour(wxNamedColour('Yellow'))
+                     wxPoint(20, 70)).SetBackgroundColour('Yellow')

 
         str = "This is a different font."
         text = wxStaticText(self, -1, str, wxPoint(20, 100))
 
         str = "This is a different font."
         text = wxStaticText(self, -1, str, wxPoint(20, 100))