X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c3422e90992d1330a8b412206d3381f63d2d29e..d8dd214c1bccfd7a7defdbbedd69aef706a8816b:/include/wx/popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 896e6f18f5..c8adb53e31 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -6,19 +6,18 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// 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/defs.h"
+
+#if wxUSE_POPUPWIN
 
 #include "wx/window.h"
 
-#if wxUSE_POPUPWIN
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
@@ -28,9 +27,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindowBase() { }
-#endif
+    virtual ~wxPopupWindowBase();
 
     // create the popup window
     //
@@ -47,17 +44,27 @@ 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 __WXMGL__
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/popupwin.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/popupwin.h"
+#elif defined(__WXMOTIF__)
+    #include "wx/motif/popupwin.h"
+#elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
@@ -68,6 +75,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:
@@ -84,11 +94,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();
@@ -103,16 +122,31 @@ 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;
 
     // 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_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
+    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -122,14 +156,15 @@ protected:
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox;
-class WXDLLEXPORT wxComboControl;
+class WXDLLEXPORT wxComboCtrl;
 
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
-    wxPopupComboWindow(wxComboControl *parent);
+    wxPopupComboWindow() { m_combo = NULL; }
+    wxPopupComboWindow(wxComboCtrl *parent);
 
-    bool Create(wxComboControl *parent);
+    bool Create(wxComboCtrl *parent);
 
     // position the window correctly relatively to the combo
     void PositionNearCombo();
@@ -138,9 +173,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)
 };
 
@@ -149,4 +188,3 @@ protected:
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_
-