X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c649a6aba49b456a8e4b0a98e4da0e7cc44a1ad8..9470921fbb927af3a4432a27d52c372998311964:/src/msw/popupwin.cpp?ds=inline diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp index eb811168db..fbe5ad21fb 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 @@ -29,6 +29,7 @@ #endif #ifndef WX_PRECOMP +#include "wx/defs.h" #endif //WX_PRECOMP #if wxUSE_POPUPWIN @@ -84,7 +85,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)