X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1897abe1d8ac5e9575f4c9a589ea7ce08189506a..8472511246c9160d4ff40ab86f635fc67c10b54a:/src/common/popupcmn.cpp 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();