X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c649a6aba49b456a8e4b0a98e4da0e7cc44a1ad8..3e1924dd5f5744c3e2a8973de9b3e4f372b7fd85:/src/msw/popupwin.cpp diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp index eb811168db..d28e3cdfa6 100644 --- a/src/msw/popupwin.cpp +++ b/src/msw/popupwin.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/popupwin.cpp +// Name: src/msw/popupwin.cpp // Purpose: implements wxPopupWindow for MSW // Author: Vadim Zeitlin // Modified by: @@ -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,25 +24,26 @@ #pragma hdrstop #endif +#if wxUSE_POPUPWIN + #ifndef WX_PRECOMP #endif //WX_PRECOMP -#if wxUSE_POPUPWIN - #include "wx/popupwin.h" #include "wx/msw/private.h" // for GetDesktopWindow() -IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) - // ============================================================================ // implementation // ============================================================================ 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); } @@ -84,13 +81,19 @@ 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 + // 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) { if ( !wxWindowMSW::Show(show) ) - return FALSE; + return false; if ( show ) { @@ -99,10 +102,12 @@ bool wxPopupWindow::Show(bool show) { wxLogLastError(_T("SetWindowPos")); } + + // and set it as the foreground window so the mouse can be captured + ::SetForegroundWindow(GetHwnd()); } - return TRUE; + return true; } #endif // #if wxUSE_POPUPWIN -