From 6001148d747ab29e5403b4b6ac1719b173c15d23 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 5 Nov 2007 16:55:13 +0000 Subject: [PATCH] popupwin on mac behaves as the implementation for msw git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@49643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/popupcmn.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 5d382ed16e..b479122fc2 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 @@ -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();