X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/220c6d434e3f4cf030a04c091b6fdd7436a92efd..fa3d9b4e301af1e236acefd3d02ee6f3d3ae18d0:/src/msw/popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index ab65556566..8469ea701d 100644
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -33,7 +33,9 @@
 
 #include "wx/popupwin.h"
 
-#include "wx/msw/private.h"     // for WS_CHILD and WS_POPUP
+#include "wx/msw/private.h"     // for GetDesktopWindow()
+
+IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 // ============================================================================
 // implementation
@@ -59,14 +61,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
@@ -76,3 +73,15 @@ 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
+    return (WXHWND)::GetDesktopWindow();
+}
+