X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c649a6aba49b456a8e4b0a98e4da0e7cc44a1ad8..ac8d0c118b7403e2838e75124b442051299e6f6c:/src/msw/popupwin.cpp diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp index eb811168db..f19637098b 100644 --- a/src/msw/popupwin.cpp +++ b/src/msw/popupwin.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "popup.h" #endif @@ -84,7 +84,13 @@ 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)