wxFileName::Get/SetTimes() finally seem to work under Windows

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 27779f34847ad5d66296650589932d7104ce4b73..63c4d65eead6c65a56eec2b5d26406ddfb93d469 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -55,7 +55,7 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
-#ifdef __WXX11__
+#elif __WXX11__
     #include "wx/x11/popupwin.h"
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
@@ -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
@@ -144,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)
 };