Compilation fix for PCH-less build after r70122.

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 87d82460ca5e9f2ed366318ef5301ef8f4fe4993..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>
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "popup.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,14 +24,14 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_POPUPWIN
+
 #ifndef WX_PRECOMP
 #endif //WX_PRECOMP
 
 #include "wx/popupwin.h"
 
-#include "wx/msw/private.h"     // for WS_CHILD and WS_POPUP
-
-wxWindowList wxPopupWindow::ms_shownPopups;
+#include "wx/msw/private.h"     // for GetDesktopWindow()
 
 // ============================================================================
 // implementation
@@ -43,8 +39,11 @@ wxWindowList wxPopupWindow::ms_shownPopups;
 
 bool wxPopupWindow::Create(wxWindow *parent, int flags)
 {
+    // popup windows are created hidden by default
+    Hide();
+
     return wxPopupWindowBase::Create(parent) &&
-               wxWindow::Create(parent, -1,
+               wxWindow::Create(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
                                 flags | wxPOPUP_WINDOW);
 }
@@ -61,14 +60,9 @@ void wxPopupWindow::DoGetPosition(int *x, int *y) const
 
 WXDWORD wxPopupWindow::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
-    // we only hnour the border flags
+    // we only honour the border flags, the others don't make sense for us
     WXDWORD style = wxWindow::MSWGetStyle(flags & wxBORDER_MASK, exstyle);
 
-    // and we mustn't have WS_CHILD style or we would be limited to the parents
-    // client area
-    style &= ~WS_CHILD;
-    style |= WS_POPUP;
-
     if ( exstyle )
     {
         // a popup window floats on top of everything
@@ -78,43 +72,42 @@ WXDWORD wxPopupWindow::MSWGetStyle(long flags, WXDWORD *exstyle) const
     return style;
 }
 
-bool wxPopupWindow::Show(bool show)
+WXHWND wxPopupWindow::MSWGetParent() const
 {
-    // skip wxWindow::Show() which calls wxBringWindowToTop(): this results in
-    // activating the popup window and stealing the atcivation from our parent
-    // which means that the parent frame becomes deactivated when opening a
-    // combobox, for example -- definitely not what we want
-    if ( !wxWindowBase::Show(show) )
-        return FALSE;
-
-    if ( show )
-    {
-        ms_shownPopups.Append(this);
-    }
-    else // remove from the shown list
-    {
-        ms_shownPopups.DeleteObject(this);
-    }
-
-    ::ShowWindow(GetHwnd(), show ? SW_SHOWNOACTIVATE : SW_HIDE);
-
-    return TRUE;
+    // we must be a child of the desktop to be able to extend beyond the parent
+    // window client area (like the comboboxes drop downs do)
+    //
+    // NB: alternative implementation would be to use WS_POPUP instead of
+    //     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();
+#endif
 }
 
-/* static */
-wxPopupWindow *wxPopupWindow::FindPopupFor(wxWindow *winParent)
+bool wxPopupWindow::Show(bool show)
 {
-    // find a popup with the given parent in the linked list of all shown
-    // popups
-    for ( wxWindowList::Node *node = ms_shownPopups.GetFirst();
-          node;
-          node = node->GetNext() )
+    if ( !wxWindowMSW::Show(show) )
+        return false;
+
+    if ( show )
     {
-        wxWindow *win = node->GetData();
-        if ( win->GetParent() == winParent )
-            return (wxPopupWindow *)win;
+        // 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 NULL;
+    return true;
 }
 
+#endif // #if wxUSE_POPUPWIN