do take the toolbar into account for Windows CE, otherwise the menus overlap with...

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

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 87d82460ca5e9f2ed366318ef5301ef8f4fe4993..aa340cdc9f8ec9a81db917d6f08737fb6c02d94b 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     08.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "popup.h"
 #endif
 
@@ -29,13 +29,16 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/defs.h"
 #endif //WX_PRECOMP
 
+#if wxUSE_POPUPWIN
+
 #include "wx/popupwin.h"
 
-#include "wx/msw/private.h"     // for WS_CHILD and WS_POPUP
+#include "wx/msw/private.h"     // for GetDesktopWindow()
 
-wxWindowList wxPopupWindow::ms_shownPopups;
+IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 // ============================================================================
 // implementation
@@ -43,6 +46,9 @@ 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,
                                 wxDefaultPosition, wxDefaultSize,
@@ -61,14 +67,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 +79,40 @@ WXDWORD wxPopupWindow::MSWGetStyle(long flags, WXDWORD *exstyle) const
     return style;
 }
 
+WXHWND wxPopupWindow::MSWGetParent() const
+{
+    // 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
+}
+
 bool wxPopupWindow::Show(bool show)
 {
-    // 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) )
+    if ( !wxWindowMSW::Show(show) )
         return FALSE;
 
     if ( show )
     {
-        ms_shownPopups.Append(this);
+        // raise to top of z order
+        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        {
+            wxLogLastError(_T("SetWindowPos"));
+        }
     }
-    else // remove from the shown list
-    {
-        ms_shownPopups.DeleteObject(this);
-    }
-
-    ::ShowWindow(GetHwnd(), show ? SW_SHOWNOACTIVATE : SW_HIDE);
 
     return TRUE;
 }
 
-/* static */
-wxPopupWindow *wxPopupWindow::FindPopupFor(wxWindow *winParent)
-{
-    // 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() )
-    {
-        wxWindow *win = node->GetData();
-        if ( win->GetParent() == winParent )
-            return (wxPopupWindow *)win;
-    }
-
-    return NULL;
-}
+#endif // #if wxUSE_POPUPWIN