X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b598e05519baef371c35cced5d243ae04d74d5a..ccdcde00d9ae27ca20ff6c3c9495918a0ec725aa:/include/wx/popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 3d9bb5e966..63c4d65eea 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -28,9 +28,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindowBase() { }
-#endif
+    virtual ~wxPopupWindowBase();
 
     // create the popup window
     //
@@ -57,6 +55,8 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
+#elif __WXX11__
+    #include "wx/x11/popupwin.h"
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
 #else
@@ -68,6 +68,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
+class WXDLLEXPORT wxPopupWindowHandler;
+class WXDLLEXPORT wxPopupFocusHandler;
+
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:
@@ -83,6 +86,10 @@ public:
 
     // hide the window
     virtual void Dismiss();
+    
+
+    virtual bool CanDismiss()
+        { 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
@@ -109,9 +116,14 @@ protected:
     // the window which has the focus while we're shown
     wxWindow *m_focus;
 
+    // these classes may call our DismissAndNotify()
     friend class wxPopupWindowHandler;
     friend class wxPopupFocusHandler;
 
+    // the handlers we created, may be NULL (if not, must be deleted)
+    wxPopupWindowHandler *m_handlerPopup;
+    wxPopupFocusHandler  *m_handlerFocus;
+
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
 };
 
@@ -139,9 +151,13 @@ protected:
     // notify the combo here
     virtual void OnDismiss();
 
+    // forward the key presses to the combobox
+    void OnKeyDown(wxKeyEvent& event);
+
     // the parent combobox
     wxComboControl *m_combo;
 
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };