Add wxItemContainer::DetachClientObject() and use it in wxRearrangeList.

[wxWidgets.git] / src / msw / popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index a9c0676ae3968e9e4cc4ce54f0b770bbf076def1..a59d329bd2aa56bf3fbe61eec262b730022e59e7 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/popupwin.cpp
+// Name:        src/msw/popupwin.cpp

 // Purpose:     implements wxPopupWindow for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     implements wxPopupWindow for MSW
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "popup.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,6 +24,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_POPUPWIN
+

 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 


@@ -35,16 +33,17 @@
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
 

-IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
 // ============================================================================
 // implementation
 // ============================================================================
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {

+    // popup windows are created hidden by default
+    Hide();
+

     return wxPopupWindowBase::Create(parent) &&
     return wxPopupWindowBase::Create(parent) &&

-               wxWindow::Create(parent, -1,
+               wxWindow::Create(parent, wxID_ANY,

                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }


@@ -82,6 +81,33 @@ WXHWND wxPopupWindow::MSWGetParent() const
     //     WS_CHILD but then showing a popup would deactivate the parent which
     //     is ugly and working around this, although possible, is even more
     //     ugly
     //     WS_CHILD but then showing a popup would deactivate the parent which
     //     is ugly and working around this, although possible, is even more
     //     ugly

+    // GetDesktopWindow() is not always supported on WinCE, and if
+    // it is, it often returns NULL.
+#ifdef __WXWINCE__
+    return 0;
+#else

     return (WXHWND)::GetDesktopWindow();
     return (WXHWND)::GetDesktopWindow();

+#endif
+}
+
+bool wxPopupWindow::Show(bool show)
+{
+    if ( !wxWindowMSW::Show(show) )
+        return false;
+
+    if ( show )
+    {
+        // raise to top of z order
+        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        {
+            wxLogLastError(wxT("SetWindowPos"));
+        }
+
+        // and set it as the foreground window so the mouse can be captured
+        ::SetForegroundWindow(GetHwnd());
+    }
+
+    return true;

 }
 
 }
 

+#endif // #if wxUSE_POPUPWIN