removed redundant code

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 55862dea2d6aea68c7c73cacec40f6910e002219..63c4d65eead6c65a56eec2b5d26406ddfb93d469 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -55,6 +55,8 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
     #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
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
 #else


@@ -66,6 +68,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
 // 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:
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:


@@ -81,6 +86,10 @@ public:
 
     // hide the window
     virtual void Dismiss();
 
     // 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
 
     // 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


@@ -107,9 +116,14 @@ protected:
     // the window which has the focus while we're shown
     wxWindow *m_focus;
 
     // 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;
 
     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)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
 };
 


@@ -137,9 +151,13 @@ protected:
     // notify the combo here
     virtual void OnDismiss();
 
     // notify the combo here
     virtual void OnDismiss();
 

+    // forward the key presses to the combobox
+    void OnKeyDown(wxKeyEvent& event);
+

     // the parent combobox
     wxComboControl *m_combo;
 
     // the parent combobox
     wxComboControl *m_combo;
 

+    DECLARE_EVENT_TABLE()

     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };
 
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };