X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/799ea01170e831c212320b0cb3038a91785e4789..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 55862dea2d..6bee065b9e 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -12,7 +12,7 @@ #ifndef _WX_POPUPWIN_H_BASE_ #define _WX_POPUPWIN_H_BASE_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "popupwinbase.h" #endif @@ -55,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 @@ -66,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: @@ -82,6 +87,12 @@ public: // hide the window virtual void Dismiss(); + // can the window be dismissed now? + // + // VZ: where is this used?? + 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 // in dismissing it if the mouse is cilcked outside it) @@ -107,10 +118,16 @@ 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) + DECLARE_NO_COPY_CLASS(wxPopupTransientWindow) }; #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -137,9 +154,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) };