X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb3fb3c73c8cc70159a191c204424a37591334..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 2de6e2e50d..e9d5ef6485 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -6,25 +6,24 @@ // Created: 06.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_POPUPWIN_H_BASE_ #define _WX_POPUPWIN_H_BASE_ -#ifdef __GNUG__ - #pragma interface "popupwinbase.h" -#endif - -#include "wx/window.h" +#include "wx/defs.h" #if wxUSE_POPUPWIN + +#include "wx/nonownedwnd.h" + // ---------------------------------------------------------------------------- // wxPopupWindow: a special kind of top level window used for popup menus, // combobox popups and such. // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxPopupWindowBase : public wxWindow +class WXDLLEXPORT wxPopupWindowBase : public wxNonOwnedWindow { public: wxPopupWindowBase() { } @@ -45,19 +44,29 @@ public: // the point must be given in screen coordinates! virtual void Position(const wxPoint& ptOrigin, const wxSize& size); + + virtual bool IsTopLevel() const { return true; } + + DECLARE_NO_COPY_CLASS(wxPopupWindowBase) }; // include the real class declaration -#ifdef __WXMSW__ +#if defined(__WXMSW__) #include "wx/msw/popupwin.h" -#elif __WXPM__ +#elif defined(__WXPM__) #include "wx/os2/popupwin.h" -#elif __WXGTK__ +#elif defined(__WXGTK20__) #include "wx/gtk/popupwin.h" -#elif __WXX11__ +#elif defined(__WXGTK__) + #include "wx/gtk1/popupwin.h" +#elif defined(__WXX11__) #include "wx/x11/popupwin.h" -#elif __WXMGL__ +#elif defined(__WXMOTIF__) + #include "wx/motif/popupwin.h" +#elif defined(__WXDFB__) + #include "wx/dfb/popupwin.h" +#elif defined(__WXMGL__) #include "wx/mgl/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." @@ -87,11 +96,20 @@ public: // hide the window virtual void Dismiss(); - // called when a mouse is pressed while the popup is shown: return TRUE + // 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) virtual bool ProcessLeftDown(wxMouseEvent& event); + // Overridden to grab the input on some plaforms + virtual bool Show( bool show = true ); + protected: // common part of all ctors void Init(); @@ -106,6 +124,14 @@ protected: // remove our event handlers void PopHandlers(); + // get alerted when child gets deleted from under us + void OnDestroy(wxWindowDestroyEvent& event); + +#ifdef __WXMSW__ + // check if the mouse needs captured or released + void OnIdle(wxIdleEvent& event); +#endif + // the child of this popup if any wxWindow *m_child; @@ -120,7 +146,9 @@ protected: wxPopupWindowHandler *m_handlerPopup; wxPopupFocusHandler *m_handlerFocus; + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow) + DECLARE_NO_COPY_CLASS(wxPopupTransientWindow) }; #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) @@ -130,15 +158,15 @@ protected: // ---------------------------------------------------------------------------- class WXDLLEXPORT wxComboBox; -class WXDLLEXPORT wxComboControl; +class WXDLLEXPORT wxComboCtrl; class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow { public: wxPopupComboWindow() { m_combo = NULL; } - wxPopupComboWindow(wxComboControl *parent); + wxPopupComboWindow(wxComboCtrl *parent); - bool Create(wxComboControl *parent); + bool Create(wxComboCtrl *parent); // position the window correctly relatively to the combo void PositionNearCombo(); @@ -147,9 +175,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; + wxComboCtrl *m_combo; + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxPopupComboWindow) }; @@ -158,4 +190,3 @@ protected: #endif // wxUSE_POPUPWIN #endif // _WX_POPUPWIN_H_BASE_ -