X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82ceade76a4913f9c6fd8dfda1fb291bf08e1d89..558820fd083635d3e1dc026a56b2f14870cb5c38:/include/wx/popupwin.h?ds=sidebyside diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 2915205ed8..dc2ede540f 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -12,22 +12,18 @@ #ifndef _WX_POPUPWIN_H_BASE_ #define _WX_POPUPWIN_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "popupwinbase.h" -#endif - #include "wx/defs.h" #if wxUSE_POPUPWIN -#include "wx/window.h" +#include "wx/nonownedwnd.h" // ---------------------------------------------------------------------------- // wxPopupWindow: a special kind of top level window used for popup menus, // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxWindow +class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -56,17 +52,21 @@ public: // include the real class declaration -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/popupwin.h" -#elif __WXPM__ +#elif defined(__WXPM__) #include "wx/os2/popupwin.h" -#elif __WXGTK__ +#elif defined(__WXGTK20__) #include "wx/gtk/popupwin.h" -#elif __WXX11__ +#elif defined(__WXGTK__) + #include "wx/gtk1/popupwin.h" +#elif defined(__WXX11__) #include "wx/x11/popupwin.h" -#elif __WXMOTIF__ +#elif defined(__WXMOTIF__) #include "wx/motif/popupwin.h" -#elif __WXMGL__ +#elif defined(__WXDFB__) + #include "wx/dfb/popupwin.h" +#elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." @@ -77,8 +77,8 @@ public: // when the user clicks mouse outside it or if it loses focus in any other way // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowHandler; -class WXDLLEXPORT wxPopupFocusHandler; +class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler; +class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler; class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow { @@ -127,12 +127,11 @@ protected: // get alerted when child gets deleted from under us void OnDestroy(wxWindowDestroyEvent& event); - void OnEnter(wxMouseEvent& event); - void OnLeave(wxMouseEvent& event); - void OnLeftDown(wxMouseEvent& event); - void OnChildEnter(wxMouseEvent& event); - void OnChildLeave(wxMouseEvent& event); - +#ifdef __WXMSW__ + // check if the mouse needs captured or released + void OnIdle(wxIdleEvent& event); +#endif + // the child of this popup if any wxWindow *m_child; @@ -158,16 +157,16 @@ protected: // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxComboBox; -class WXDLLEXPORT wxComboControl; +class WXDLLIMPEXP_FWD_CORE wxComboBox; +class WXDLLIMPEXP_FWD_CORE wxComboCtrl; class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; } - wxPopupComboWindow(wxComboControl *parent); + wxPopupComboWindow(wxComboCtrl *parent); - bool Create(wxComboControl *parent); + bool Create(wxComboCtrl *parent); // position the window correctly relatively to the combo void PositionNearCombo(); @@ -180,7 +179,7 @@ protected: void OnKeyDown(wxKeyEvent& event); // the parent combobox - wxComboControl *m_combo; + wxComboCtrl *m_combo; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupComboWindow) @@ -191,4 +190,3 @@ protected: #endif // wxUSE_POPUPWIN #endif // _WX_POPUPWIN_H_BASE_ -