EVT_KEY_DOWN(wxPopupFocusHandler::OnKeyDown)
END_EVENT_TABLE()
+BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
+#ifdef __WXMSW__
+ EVT_IDLE(wxPopupTransientWindow::OnIdle)
+#endif
+END_EVENT_TABLE()
+
// ============================================================================
// implementation
// ============================================================================
// handler - so don't risk deleting it second time
m_handlerPopup = NULL;
}
-
+ if (m_child->HasCapture())
+ {
+ m_child->ReleaseMouse();
+ }
m_child = NULL;
}
m_child->Connect(wxEVT_DESTROY,
wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
NULL, this);
- m_focus->Connect(wxEVT_DESTROY,
- wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
- NULL, this);
+ if (m_focus)
+ m_focus->Connect(wxEVT_DESTROY,
+ wxWindowDestroyEventHandler(wxPopupTransientWindow::OnDestroy),
+ NULL, this);
}
bool wxPopupTransientWindow::Show( bool show )
}
#endif
+#ifdef __WXMSW__
+ if (!show && m_child && m_child->HasCapture())
+ {
+ m_child->ReleaseMouse();
+ }
+#endif
+
bool ret = wxPopupWindow::Show( show );
#ifdef __WXGTK__
CurrentTime );
}
#endif
+
+#ifdef __WXMSW__
+ if (show && m_child)
+ {
+ // Assume that the mouse is outside the popup to begin with
+ m_child->CaptureMouse();
+ }
+#endif
+
return ret;
}
void wxPopupTransientWindow::Dismiss()
{
- PopHandlers();
-
Hide();
+ PopHandlers();
}
void wxPopupTransientWindow::DismissAndNotify()
{
Dismiss();
-
OnDismiss();
}
m_focus = NULL;
}
+#ifdef __WXMSW__
+void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
+{
+ event.Skip();
+
+ if (IsShown() && m_child)
+ {
+ wxPoint pos = ScreenToClient(wxGetMousePosition());
+ wxRect rect(GetSize());
+
+ if ( rect.Inside(pos) )
+ {
+ if ( m_child->HasCapture() )
+ {
+ m_child->ReleaseMouse();
+ }
+ }
+ else
+ {
+ if ( !m_child->HasCapture() )
+ {
+ m_child->CaptureMouse();
+ }
+ }
+ }
+}
+#endif
+
+
#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
// ----------------------------------------------------------------------------