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 82979bafa9f5920e7d16180338059ab120e5eef1..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.
@@ -46,6 +49,8 @@ public:
     virtual void Position(const wxPoint& ptOrigin,
                           const wxSize& size);
 
+    virtual bool IsTopLevel() const { return true; }
+
     DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
 };
 
@@ -59,6 +64,8 @@ public:
     #include "wx/gtk/popupwin.h"
 #elif __WXX11__
     #include "wx/x11/popupwin.h"
+#elif __WXMOTIF__
+    #include "wx/motif/popupwin.h"
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
 #else
@@ -93,13 +100,16 @@ public:
     //
     // VZ: where is this used??
     virtual bool CanDismiss()
-        { return TRUE; }
+        { return true; }
 
-    // called when a mouse is pressed while the popup is shown: return TRUE
+    // 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)
     virtual bool ProcessLeftDown(wxMouseEvent& event);
 
+    // Overridden to grab the input on some plaforms
+    virtual bool Show( bool show = true );
+
 protected:
     // common part of all ctors
     void Init();
@@ -114,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;
 
@@ -128,6 +147,7 @@ protected:
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
     DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };