X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0122b7e3fcfd78f879470053c91a60e3c66537a3..6af638ed35e8f1c414cc209cda8e5059552883c8:/wxPython/demo/wxPopupWindow.py?ds=sidebyside

diff --git a/wxPython/demo/wxPopupWindow.py b/wxPython/demo/wxPopupWindow.py
index 58133946bb..5f6477804e 100644
--- a/wxPython/demo/wxPopupWindow.py
+++ b/wxPython/demo/wxPopupWindow.py
@@ -3,29 +3,81 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class TestPopup(wxPopupWindow):
+    """Adds a bit of text and mouse movement to the wxPopupWindow"""
     def __init__(self, parent, style):
         wxPopupWindow.__init__(self, parent, style)
+        self.SetBackgroundColour("CADET BLUE")
+        st = wxStaticText(self, -1,
+                          "This is a special kind of top level\n"
+                          "window that can be used for\n"
+                          "popup menus, combobox popups\n"
+                          "and such.\n\n"
+                          "Try positioning the demo near\n"
+                          "the bottom of the screen and \n"
+                          "hit the button again.\n\n"
+                          "In this demo this window can\n"
+                          "be dragged with the left button\n"
+                          "and closed with the right."
+                          ,
+                          pos=(10,10))
+        sz = st.GetBestSize()
+        self.SetSize( (sz.width+20, sz.height+20) )
 
         EVT_LEFT_DOWN(self, self.OnMouseLeftDown)
         EVT_MOTION(self, self.OnMouseMotion)
         EVT_LEFT_UP(self, self.OnMouseLeftUp)
+        EVT_RIGHT_UP(self, self.OnRightUp)
+        EVT_LEFT_DOWN(st, self.OnMouseLeftDown)
+        EVT_MOTION(st, self.OnMouseMotion)
+        EVT_LEFT_UP(st, self.OnMouseLeftUp)
+        EVT_RIGHT_UP(st, self.OnRightUp)
 
     def OnMouseLeftDown(self, evt):
-        self.ldPos = evt.GetPosition()
+        self.ldPos = evt.GetEventObject().ClientToScreen(evt.GetPosition())
+        self.wPos = self.GetPosition()
         self.CaptureMouse()
 
     def OnMouseMotion(self, evt):
-        if evt.Dragging():
-            wPos = self.GetPosition()
-            dPos = evt.GetPosition()
-            self.Move((wPos.x + (dPos.x - self.ldPos.x),
-                       wPos.y + (dPos.y - self.ldPos.y)))
-            print self.GetPosition()
+        if evt.Dragging() and evt.LeftIsDown():
+            dPos = evt.GetEventObject().ClientToScreen(evt.GetPosition())
+            nPos = (self.wPos.x + (dPos.x - self.ldPos.x),
+                    self.wPos.y + (dPos.y - self.ldPos.y))
+            self.Move(nPos)
 
     def OnMouseLeftUp(self, evt):
         self.ReleaseMouse()
-        pass
 
+    def OnRightUp(self, evt):
+        self.Show(false)
+        self.Destroy()
+
+
+class TestTransientPopup(wxPopupTransientWindow):
+    """Adds a bit of text and mouse movement to the wxPopupWindow"""
+    def __init__(self, parent, style, log):
+        wxPopupTransientWindow.__init__(self, parent, style)
+        self.log = log
+        panel = wxPanel(self, -1)
+        panel.SetBackgroundColour("#FFB6C1")
+        st = wxStaticText(panel, -1,
+                          "wxPopupTransientWindow is a\n"
+                          "wxPopupWindow which disappears\n"
+                          "automatically when the user\n"
+                          "clicks the mouse outside it or if it\n"
+                          "loses focus in any other way."
+                          ,
+                          pos=(10,10))
+        sz = st.GetBestSize()
+        panel.SetSize( (sz.width+20, sz.height+20) )
+        self.SetSize(panel.GetSize())
+
+
+    def ProcessLeftDown(self, evt):
+        self.log.write("ProcessLeftDown\n")
+        return false
+
+    def OnDismiss(self):
+        self.log.write("OnDismiss\n")
 
 
 class TestPanel(wxPanel):
@@ -33,19 +85,39 @@ class TestPanel(wxPanel):
         wxPanel.__init__(self, parent, -1)
         self.log = log
 
-        b = wxButton(self, -1, "Show popup window", (25, 50))
+        b = wxButton(self, -1, "Show wxPopupWindow", (25, 50))
         EVT_BUTTON(self, b.GetId(), self.OnShowPopup)
 
+        b = wxButton(self, -1, "Show wxPopupTransientWindow", (25, 95))
+        EVT_BUTTON(self, b.GetId(), self.OnShowPopupTransient)
+
 
     def OnShowPopup(self, evt):
         win = TestPopup(self, wxSIMPLE_BORDER)
-        #win.SetPosition((200, 200))
-        #win.SetSize((150, 150))
-        win.Position((200, 200), (150, 150))
-        win.SetBackgroundColour("CADET BLUE")
+
+        # Show the popup right below or above the button
+        # depending on available screen space...
+        btn = evt.GetEventObject()
+        pos = btn.ClientToScreen( (0,0) )
+        sz =  btn.GetSize()
+        win.Position(pos, (0, sz.height))
+
         win.Show(true)
 
 
+    def OnShowPopupTransient(self, evt):
+        win = TestTransientPopup(self, wxSIMPLE_BORDER, self.log)
+
+        # Show the popup right below or above the button
+        # depending on available screen space...
+        btn = evt.GetEventObject()
+        pos = btn.ClientToScreen( (0,0) )
+        sz =  btn.GetSize()
+        win.Position(pos, (0, sz.height))
+
+        win.Popup()
+
+
 
 #---------------------------------------------------------------------------