///////////////////////////////////////////////////////////////////////////////
-// Name: msw/popupwin.cpp
+// Name: src/msw/popupwin.cpp
// Purpose: implements wxPopupWindow for MSW
// Author: Vadim Zeitlin
// Modified by:
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "popup.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
+#if wxUSE_POPUPWIN
+
#ifndef WX_PRECOMP
-#include "wx/defs.h"
#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);
}
bool wxPopupWindow::Show(bool show)
{
if ( !wxWindowMSW::Show(show) )
- return FALSE;
+ 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"));
+ wxLogLastError(wxT("SetWindowPos"));
}
+
+ // and set it as the foreground window so the mouse can be captured
+ ::SetForegroundWindow(GetHwnd());
}
- return TRUE;
+ return true;
}
#endif // #if wxUSE_POPUPWIN
-