From: Stefan Csomor Date: Tue, 25 Mar 2008 07:35:18 +0000 (+0000) Subject: make popup on mac behave as on msw X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9a8909371b50c92753af2ab6d432aa8124122ec1 make popup on mac behave as on msw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 57ba86c0a0..bef08770aa 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -107,7 +107,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) EVT_IDLE(wxPopupTransientWindow::OnIdle) #endif END_EVENT_TABLE() @@ -263,7 +263,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_focus = winFocus ? winFocus : this; m_focus->SetFocus(); -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) // MSW doesn't allow to set focus to the popup window, but we need to // subclass the window which has the focus, and not winFocus passed in or // otherwise everything else breaks down @@ -301,7 +301,7 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (!show && m_child && m_child->HasCapture()) { m_child->ReleaseMouse(); @@ -343,7 +343,7 @@ bool wxPopupTransientWindow::Show( bool show ) } #endif -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) if (show && m_child) { // Assume that the mouse is outside the popup to begin with @@ -377,7 +377,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -#ifdef __WXMSW__ +#if defined( __WXMSW__ ) || defined( __WXMAC__) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { event.Skip();