Prevent activation of the AUI hint window (mini frame) on Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
442e842ee7
commit
d90dcdb784
@ -501,6 +501,8 @@ public:
|
||||
virtual void ShowHint(const wxRect& rect);
|
||||
virtual void HideHint();
|
||||
|
||||
void OnHintActivate(wxActivateEvent& event);
|
||||
|
||||
public:
|
||||
|
||||
// deprecated -- please use SetManagedWindow() and
|
||||
|
@ -814,6 +814,8 @@ void wxAuiManager::UpdateHintWindowConfig()
|
||||
wxDefaultPosition, wxSize(1,1),
|
||||
wxFRAME_FLOAT_ON_PARENT
|
||||
| wxFRAME_TOOL_WINDOW );
|
||||
m_hint_wnd->Connect(wxEVT_ACTIVATE,
|
||||
wxActivateEventHandler(wxAuiManager::OnHintActivate), NULL, this);
|
||||
|
||||
// Can't set the bg colour of a Frame in wxMac
|
||||
wxPanel* p = new wxPanel(m_hint_wnd);
|
||||
@ -3298,6 +3300,17 @@ void wxAuiManager::HideHint()
|
||||
}
|
||||
}
|
||||
|
||||
void wxAuiManager::OnHintActivate(wxActivateEvent& WXUNUSED(event))
|
||||
{
|
||||
// Do nothing so this event isn't handled in the base handlers.
|
||||
|
||||
// Letting the hint window activate without this handler can lead to
|
||||
// weird behavior on Mac where the menu is switched out to the top
|
||||
// window's menu in MDI applications when it shouldn't be. So since
|
||||
// we don't want user interaction with the hint window anyway, we just
|
||||
// prevent it from activating here.
|
||||
}
|
||||
|
||||
|
||||
|
||||
void wxAuiManager::StartPaneDrag(wxWindow* pane_window,
|
||||
|
Loading…
Reference in New Issue
Block a user