X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12028905135250524409f1e7b9bfa9c55e5ce16b..ffb9247a85e83dcc4da631b76d0b86c0b2192676:/include/wx/popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 82979bafa9..971c761b98 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 <zeitlin@dptmaths.ens-cachan.fr>
-// License:     wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_POPUPWIN_H_BASE_
 #define _WX_POPUPWIN_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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 WXDLLIMPEXP_CORE wxPopupWindowBase : public wxNonOwnedWindow
 {
 public:
     wxPopupWindowBase() { }
@@ -46,21 +45,31 @@ public:
     virtual void Position(const wxPoint& ptOrigin,
                           const wxSize& size);
 
-    DECLARE_NO_COPY_CLASS(wxPopupWindowBase)
+    virtual bool IsTopLevel() const { return true; }
+
+    wxDECLARE_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"
+#elif defined(__WXMAC__)
+    #include "wx/osx/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
@@ -70,10 +79,10 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxPopupWindowHandler;
-class WXDLLEXPORT wxPopupFocusHandler;
+class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler;
+class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler;
 
-class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
+class WXDLLIMPEXP_CORE wxPopupTransientWindow : public wxPopupWindow
 {
 public:
     // ctors
@@ -93,13 +102,16 @@ public:
     //
     // VZ: where is this used??
     virtual bool CanDismiss()
-        { return TRUE; }
+        { return true; }
 
-    // called when a mouse is pressed while the popup is shown: 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();
@@ -114,6 +126,14 @@ protected:
     // remove our event handlers
     void PopHandlers();
 
+    // get alerted when child gets deleted from under us
+    void OnDestroy(wxWindowDestroyEvent& event);
+
+#if defined( __WXMSW__ ) || defined( __WXMAC__)
+    // check if the mouse needs captured or released
+    void OnIdle(wxIdleEvent& event);
+#endif
+
     // the child of this popup if any
     wxWindow *m_child;
 
@@ -128,8 +148,9 @@ protected:
     wxPopupWindowHandler *m_handlerPopup;
     wxPopupFocusHandler  *m_handlerFocus;
 
+    DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
-    DECLARE_NO_COPY_CLASS(wxPopupTransientWindow)
+    wxDECLARE_NO_COPY_CLASS(wxPopupTransientWindow);
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -138,16 +159,16 @@ protected:
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxComboBox;
-class WXDLLEXPORT wxComboControl;
+class WXDLLIMPEXP_FWD_CORE wxComboBox;
+class WXDLLIMPEXP_FWD_CORE wxComboCtrl;
 
-class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
+class WXDLLIMPEXP_CORE 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();
@@ -160,7 +181,7 @@ protected:
     void OnKeyDown(wxKeyEvent& event);
 
     // the parent combobox
-    wxComboControl *m_combo;
+    wxComboCtrl *m_combo;
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
@@ -171,4 +192,3 @@ protected:
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_
-