Fixes for wxPopupTransientWindow for wxMSW. Includes Patch #1181190,

[wxWidgets.git] / include / wx / popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index e0e5eefca978a5850c69e950347863d4f2c2ca6b..2915205ed8fb3b6b4c2886e6a86922598dab5506 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -16,9 +16,12 @@
     #pragma interface "popupwinbase.h"
 #endif
 
-#include "wx/window.h"
+#include "wx/defs.h"
 
 #if wxUSE_POPUPWIN
+
+#include "wx/window.h"
+
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
@@ -106,7 +109,7 @@ public:
 
     // Overridden to grab the input on some plaforms
     virtual bool Show( bool show = true );
-    
+
 protected:
     // common part of all ctors
     void Init();
@@ -121,6 +124,15 @@ protected:
     // remove our event handlers
     void PopHandlers();
 
+    // 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);
+    
     // the child of this popup if any
     wxWindow *m_child;
 
@@ -135,6 +147,7 @@ protected:
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
     DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };