From 04a123c642b0fc589e29cdd507faf11b85973f79 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 3 Jun 2013 13:21:10 +0000 Subject: [PATCH] using ordinary Show for popup windows as on MSW which activates it as well, I'll rewire ShowWithoutActivating for the other use case, fixes #15008 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/popupwin.h | 2 -- src/osx/carbon/popupwin.cpp | 21 --------------------- 2 files changed, 23 deletions(-) diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h index 4a429de678..b815a61c16 100644 --- a/include/wx/osx/popupwin.h +++ b/include/wx/osx/popupwin.h @@ -27,8 +27,6 @@ public: bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show = true); - DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow) }; diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp index 5f73691371..82488c73ce 100644 --- a/src/osx/carbon/popupwin.cpp +++ b/src/osx/carbon/popupwin.cpp @@ -56,25 +56,4 @@ bool wxPopupWindow::Create(wxWindow *parent, int flags) } -bool wxPopupWindow::Show(bool show) -{ - if ( !wxWindow::Show(show) ) - return false; - - if ( m_nowpeer && show) - m_nowpeer->ShowWithoutActivating(); - else if ( m_nowpeer ) - m_nowpeer->Show(false); - - if ( show ) - { - // because apps expect a size event to occur at this moment - wxSizeEvent event(GetSize() , m_windowId); - event.SetEventObject(this); - HandleWindowEvent(event); - } - - return true; -} - #endif // #if wxUSE_POPUPWIN -- 2.45.2