using ordinary Show for popup windows as on MSW which activates it as well, I'll...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index 4a429de67831f498eece5d0e81b1bd3ff60f6f8a..b815a61c1635832a31a556e81c7cf3cd21bf8303 100644 (file)
--- 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);
 
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 

-    virtual bool Show(bool show = true);
-

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
 };
 

diff --git a/src/osx/carbon/popupwin.cpp b/src/osx/carbon/popupwin.cpp
index 5f7369137141705216f55d92a46a1a3058a26199..82488c73ce0a174cb7b1e79e14459cb5b93fa25b 100644 (file)
--- 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
 #endif // #if wxUSE_POPUPWIN