X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4346967a201ce329c1ff17357f5a4d362c30144..ab67e8874db324fab5223cc8d5dff8a8de3e2b77:/include/wx/popupwin.h?ds=sidebyside diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 72d822411c..84474fa8eb 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -6,7 +6,7 @@ // Created: 06.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_POPUPWIN_H_BASE_ @@ -23,7 +23,7 @@ // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow +class WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -47,7 +47,7 @@ public: virtual bool IsTopLevel() const { return true; } - DECLARE_NO_COPY_CLASS(wxPopupWindowBase) + wxDECLARE_NO_COPY_CLASS(wxPopupWindowBase); }; @@ -66,10 +66,8 @@ 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/mac/popupwin.h" + #include "wx/osx/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." #endif @@ -82,7 +80,7 @@ public: class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; -class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow +class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow { public: // ctors @@ -106,12 +104,15 @@ public: // called when a mouse is pressed while the popup is shown: return true // from here to prevent its normal processing by the popup (which consists - // in dismissing it if the mouse is cilcked outside it) + // in dismissing it if the mouse is clicked outside it) virtual bool ProcessLeftDown(wxMouseEvent& event); // 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 +130,9 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); -#ifdef __WXMSW__ - // check if the mouse needs captured or released +#if defined(__WXMSW__) ||(defined(__WXMAC__) && wxOSX_USE_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 @@ -150,7 +152,7 @@ protected: DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow) - DECLARE_NO_COPY_CLASS(wxPopupTransientWindow) + wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow); }; #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -162,7 +164,7 @@ protected: class WXDLLIMPEXP_FWD_CORE wxComboBox; class WXDLLIMPEXP_FWD_CORE wxComboCtrl; -class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow +class WXDLLIMPEXP_CORE wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; }