From b7005dfd8a49d599a26e78bee3a42737f554a91c Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 3 Jun 2013 08:34:11 +0000 Subject: [PATCH] deal with Cocoa as we do with Carbon, see #15008 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74092 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 97fdb8ccb4..32c8464563 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -116,7 +116,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) -#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) +#if defined(__WXMSW__) || (defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) EVT_IDLE(wxPopupTransientWindow::OnIdle) #endif END_EVENT_TABLE() @@ -298,7 +298,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus) m_focus->SetFocus(); } -#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_CARBON) +#if defined( __WXMSW__ ) || (defined( __WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) // 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 @@ -443,7 +443,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event)) return false; } -#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_CARBON) +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event) { event.Skip(); -- 2.45.2