X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82ceade76a4913f9c6fd8dfda1fb291bf08e1d89..2c01d33555e3125057f4575ca7d0d2aba93f421f:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 2915205ed8..7a4d3c136b 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -12,10 +12,6 @@ #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 @@ -56,17 +52,17 @@ 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(__WXGTK__) #include "wx/gtk/popupwin.h" -#elif __WXX11__ +#elif defined(__WXX11__) #include "wx/x11/popupwin.h" -#elif __WXMOTIF__ +#elif defined(__WXMOTIF__) #include "wx/motif/popupwin.h" -#elif __WXMGL__ +#elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." @@ -127,12 +123,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; @@ -191,4 +186,3 @@ protected: #endif // wxUSE_POPUPWIN #endif // _WX_POPUPWIN_H_BASE_ -