X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..6dbb903bb9410e2a2a977ad349ba7b4b3b12ac78:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 27779f3484..63c4d65eea 100644 --- 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) };