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

make popup on mac behave as on msw

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2008-03-25 07:35:18 +00:00
parent ce4cf38592
commit 9a8909371b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/popupcmn.cpp
View File

@@ -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
@@ -301,7 +301,7 @@ bool wxPopupTransientWindow::Show( bool show )
} }
#endif #endif
#ifdef __WXMSW__ #if defined( __WXMSW__ ) || defined( __WXMAC__)
if (!show && m_child && m_child->HasCapture()) if (!show && m_child && m_child->HasCapture())
{ {
m_child->ReleaseMouse(); m_child->ReleaseMouse();
@@ -343,7 +343,7 @@ bool wxPopupTransientWindow::Show( bool show )
} }
#endif #endif
#ifdef __WXMSW__ #if defined( __WXMSW__ ) || defined( __WXMAC__)
if (show && m_child) if (show && m_child)
{ {
// Assume that the mouse is outside the popup to begin with // Assume that the mouse is outside the popup to begin with
@@ -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();