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
This commit is contained in:
@@ -107,7 +107,7 @@ BEGIN_EVENT_TABLE(wxPopupFocusHandler, wxEvtHandler)
|
|||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
|
|
||||||
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
|
BEGIN_EVENT_TABLE(wxPopupTransientWindow, wxPopupWindow)
|
||||||
#ifdef __WXMSW__
|
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
|
||||||
EVT_IDLE(wxPopupTransientWindow::OnIdle)
|
EVT_IDLE(wxPopupTransientWindow::OnIdle)
|
||||||
#endif
|
#endif
|
||||||
END_EVENT_TABLE()
|
END_EVENT_TABLE()
|
||||||
@@ -263,7 +263,7 @@ void wxPopupTransientWindow::Popup(wxWindow *winFocus)
|
|||||||
m_focus = winFocus ? winFocus : this;
|
m_focus = winFocus ? winFocus : this;
|
||||||
m_focus->SetFocus();
|
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
|
// 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
|
||||||
@@ -377,7 +377,7 @@ bool wxPopupTransientWindow::ProcessLeftDown(wxMouseEvent& WXUNUSED(event))
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
|
||||||
void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
|
void wxPopupTransientWindow::OnIdle(wxIdleEvent& event)
|
||||||
{
|
{
|
||||||
event.Skip();
|
event.Skip();
|
||||||
|
Reference in New Issue
Block a user