X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25b1b442d63f3ff7ca4d007843b2d02f9137f801..4cd1ed991c6654612521be12efa5a9814ad033a7:/src/msw/popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 6cddce9ae3..dcd2272474 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
@@ -45,8 +46,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow)
 
 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,28 +88,30 @@ 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 ( !wxWindowBase::Show(show) )
-        return FALSE;
-
-    HWND hWnd = GetHwnd();
-    int cshow = show ? SW_SHOW : SW_HIDE;
-    ::ShowWindow(hWnd, cshow);
+    if ( !wxWindowMSW::Show(show) )
+        return false;
 
     if ( show )
     {
         // raise to top of z order
-        if (!::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
         {
             wxLogLastError(_T("SetWindowPos"));
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 #endif // #if wxUSE_POPUPWIN