Better alphabetized the event handler macros

[wxWidgets.git] / src / msw / popupwin.cpp

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 8469ea701d1d62dc242f4469d4c1f17eb842e3cf..dcd2272474e8ed0f312bc21f9a8d8bfa9c42e5d0 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -6,7 +6,7 @@
 // Created:     08.05.02
 // RCS-ID:      $Id$
 // Copyright:   (c) 2002 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows license
+// License:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "popup.h"
 #endif
 
@@ -29,8 +29,11 @@
 #endif
 
 #ifndef WX_PRECOMP
+#include "wx/defs.h"
 #endif //WX_PRECOMP
 
+#if wxUSE_POPUPWIN
+
 #include "wx/popupwin.h"
 
 #include "wx/msw/private.h"     // for GetDesktopWindow()
@@ -43,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);
 }
@@ -82,6 +88,31 @@ 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;
+
+    if ( show )
+    {
+        // raise to top of z order
+        if (!::SetWindowPos(GetHwnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        {
+            wxLogLastError(_T("SetWindowPos"));
+        }
+    }
+
+    return true;
+}
+
+#endif // #if wxUSE_POPUPWIN
+