Added OGL to contrib

[wxWidgets.git] / utils / wxPython / demo / DragAndDrop.py

diff --git a/utils/wxPython/demo/DragAndDrop.py b/utils/wxPython/demo/DragAndDrop.py
index 0fd84b781f72c7e2689f9a78603b970ace097077..090c162b890e9070eecaa4821ada00e4b10afc44 100644 (file)
--- a/utils/wxPython/demo/DragAndDrop.py
+++ b/utils/wxPython/demo/DragAndDrop.py
@@ -8,8 +8,6 @@ class ClipTextPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
         wxPanel.__init__(self, parent, -1)
         self.log = log
 

-        self.do = wxTextDataObject()
-

         #self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
 
         sizer = wxBoxSizer(wxVERTICAL)
         #self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
 
         sizer = wxBoxSizer(wxVERTICAL)


@@ -35,6 +33,7 @@ class ClipTextPanel(wxPanel):
 
 
     def OnCopy(self, evt):
 
 
     def OnCopy(self, evt):

+        self.do = wxTextDataObject()

         self.do.SetText(self.text.GetValue())
         wxTheClipboard.Open()
         wxTheClipboard.SetData(self.do)
         self.do.SetText(self.text.GetValue())
         wxTheClipboard.Open()
         wxTheClipboard.SetData(self.do)


@@ -42,11 +41,12 @@ class ClipTextPanel(wxPanel):
 
 
     def OnPaste(self, evt):
 
 
     def OnPaste(self, evt):

+        do = wxTextDataObject()

         wxTheClipboard.Open()
         wxTheClipboard.Open()

-        success = wxTheClipboard.GetData(self.do)
+        success = wxTheClipboard.GetData(do)

         wxTheClipboard.Close()
         if success:
         wxTheClipboard.Close()
         if success:

-            self.text.SetValue(self.do.GetText())
+            self.text.SetValue(do.GetText())

         else:
             wxMessageBox("There is no data in the clipboard in the required format",
                          "Error")
         else:
             wxMessageBox("There is no data in the clipboard in the required format",
                          "Error")


@@ -149,9 +149,12 @@ class TestPanel(wxPanel):
         self.SetAutoLayout(true)
         outsideSizer = wxBoxSizer(wxVERTICAL)
 
         self.SetAutoLayout(true)
         outsideSizer = wxBoxSizer(wxVERTICAL)
 

+        msg = "Clipboard / Drag-And-Drop"

         text = wxStaticText(self, -1, "", style=wxALIGN_CENTRE)
         text.SetFont(wxFont(24, wxSWISS, wxNORMAL, wxBOLD, false))
         text = wxStaticText(self, -1, "", style=wxALIGN_CENTRE)
         text.SetFont(wxFont(24, wxSWISS, wxNORMAL, wxBOLD, false))

-        text.SetLabel("Clipboard / Drag-And-Drop")
+        text.SetLabel(msg)
+        w,h = text.GetTextExtent(msg)
+        text.SetSize(wxSize(w,h+1))

         text.SetForegroundColour(wxBLUE)
         outsideSizer.Add(text, 0, wxEXPAND|wxALL, 5)
         outsideSizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
         text.SetForegroundColour(wxBLUE)
         outsideSizer.Add(text, 0, wxEXPAND|wxALL, 5)
         outsideSizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)