Some little demo tweaks

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

diff --git a/wxPython/demo/CustomDragAndDrop.py b/wxPython/demo/CustomDragAndDrop.py
index ff22fb18b073abd7d38b9f8dfadeb3aca63c0ab7..1c2b33777d4664976979ca90954269147d8749f3 100644 (file)
--- a/wxPython/demo/CustomDragAndDrop.py
+++ b/wxPython/demo/CustomDragAndDrop.py
@@ -82,7 +82,7 @@ class DoodlePad(wx.Window):
 
         # 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
@@ -125,8 +125,7 @@ class DoodleDropTarget(wx.PyDropTarget):
         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)
 
 
@@ -216,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"
-                            "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)

diff --git a/wxPython/demo/DragAndDrop.py b/wxPython/demo/DragAndDrop.py
index 3b393d6bc8dfda0c1cff019d1cff52dff4f59539..95b192dbbb07f16b1d86c2a94cf9f3195b4418e1 100644 (file)
--- a/wxPython/demo/DragAndDrop.py
+++ b/wxPython/demo/DragAndDrop.py
@@ -48,16 +48,19 @@ class ClipTextPanel(wx.Panel):
     def OnCopy(self, evt):
         self.do = wx.TextDataObject()
         self.do.SetText(self.text.GetValue())
-        wx.TheClipboard.Open()
-        wx.TheClipboard.SetData(self.do)
-        wx.TheClipboard.Close()
+        if wx.TheClipboard.Open():
+            wx.TheClipboard.SetData(self.do)
+            wx.TheClipboard.Close()
+        else:
+            wx.MessageBox("Unable to open the clipboard", "Error")
 
 
     def OnPaste(self, evt):
+        success = False
         do = wx.TextDataObject()
-        wx.TheClipboard.Open()
-        success = wx.TheClipboard.GetData(do)
-        wx.TheClipboard.Close()
+        if wx.TheClipboard.Open():
+            success = wx.TheClipboard.GetData(do)
+            wx.TheClipboard.Close()
 
         if success:
             self.text.SetValue(do.GetText())
@@ -73,14 +76,19 @@ class ClipTextPanel(wx.Panel):
         if dlg.ShowModal() == wx.ID_OK:
             bmp = wx.Bitmap(dlg.GetPath(), wx.BITMAP_TYPE_BMP)
             bmpdo = wx.BitmapDataObject(bmp)
-            wx.TheClipboard.Open()
-            wx.TheClipboard.SetData(bmpdo)
-            wx.TheClipboard.Close()
-
-            wx.MessageBox(
-                "The bitmap is now in the Clipboard.  Switch to a graphics\n"
-                "editor and try pasting it in..."
-                )
+            if wx.TheClipboard.Open():
+                wx.TheClipboard.SetData(bmpdo)
+                wx.TheClipboard.Close()
+
+                wx.MessageBox(
+                    "The bitmap is now in the Clipboard.  Switch to a graphics\n"
+                    "editor and try pasting it in..."
+                    )
+            else:
+                wx.MessageBox(
+                    "There is no data in the clipboard in the required format",
+                    "Error"
+                    )
 
         dlg.Destroy()
 

diff --git a/wxPython/demo/PrintFramework.py b/wxPython/demo/PrintFramework.py
index c63ac9630a56f18aa8c207e415cb52021338884e..86dcdd5eca3d0fcdfb01255a34035cc721d1fb5e 100644 (file)
--- a/wxPython/demo/PrintFramework.py
+++ b/wxPython/demo/PrintFramework.py
@@ -132,7 +132,7 @@ class TestPrintPanel(wx.Panel):
         printerDialog.ShowModal();
 
         # this makes a copy of the wx.PrintData instead of just saving
-        # a reference to the one inside the printDialogData that will
+        # a reference to the one inside the PrintDialogData that will
         # be destroyed when the dialog is destroyed
         self.printData = wx.PrintData( printerDialog.GetPrintDialogData().GetPrintData() )