X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0419fee9c3f0acc5cc0712796b2818f4f434d70e..38534f596974042130716a26276e9564b0b72295:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 4f451a644e..3a16fa1b1a 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -66,8 +66,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 @@ -132,10 +130,9 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); - // wxOSX/Carbon doesn't generate mouse capture loss events currently so - // poll for the capture loss ourselves. -#if wxOSX_USE_CARBON - // 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