X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d090da1e9e618b60f176cc27fc8a79eadde44b4..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index da479f31ba..6b61517f39 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 06.01.01 -// RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +65,6 @@ public: #include "wx/motif/popupwin.h" #elif defined(__WXDFB__) #include "wx/dfb/popupwin.h" -#elif defined(__WXMGL__) - #include "wx/mgl/popupwin.h" #elif defined(__WXMAC__) #include "wx/osx/popupwin.h" #else @@ -112,6 +109,9 @@ public: // Overridden to grab the input on some plaforms virtual bool Show( bool show = true ); + // Override to implement delayed destruction of this window. + virtual bool Destroy(); + protected: // common part of all ctors void Init(); @@ -129,8 +129,9 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); -#if defined( __WXMSW__ ) || defined( __WXMAC__) - // check if the mouse needs captured or released +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON) + // Check if the mouse needs to be captured or released: we must release + // when it's inside our window if we want the embedded controls to work. void OnIdle(wxIdleEvent& event); #endif