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