Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deal with Cocoa as we do with Carbon, see #15008

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-03 08:34:11 +00:00
parent 77d2aaf0b4
commit b7005dfd8a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/popupcmn.cpp
View File

@@ -116,7 +116,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
END_EVENT_TABLE() END_EVENT_TABLE()
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow) 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) EVT_IDLE(wxPopupTransientWindow::OnIdle)
#endif #endif
END_EVENT_TABLE() END_EVENT_TABLE()
@@ -298,7 +298,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
m_focus->SetFocus(); 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 // 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 // subclass the window which has the focus, and not winFocus passed in or
// otherwise everything else breaks down // otherwise everything else breaks down
@@ -443,7 +443,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
return false; 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) void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
{ {
event.Skip(); event.Skip();