fixing 10.5 only compiles

[wxWidgets.git] / include / wx / popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 85ce6295e64d869479692f4204e7af92038702d5..72d822411cd8678288df637d25eda1b182165f2a 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -6,32 +6,28 @@
 // Created:     06.01.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // 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_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #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
 
 
 #if wxUSE_POPUPWIN
 

+#include "wx/nonownedwnd.h"
+

 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // 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() { }
 {
 public:
     wxPopupWindowBase() { }

-#ifdef __DARWIN__
-    virtual ~wxPopupWindowBase() { }
-#endif
+    virtual ~wxPopupWindowBase();

 
     // create the popup window
     //
 
     // create the popup window
     //


@@ -48,15 +44,32 @@ public:
     // the point must be given in screen coordinates!
     virtual void Position(const wxPoint& ptOrigin,
                           const wxSize& size);
     // 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
 // include the real class declaration

-#ifdef __WXMSW__
+#if defined(__WXMSW__)

     #include "wx/msw/popupwin.h"
     #include "wx/msw/popupwin.h"

-#elif __WXGTK__
+#elif defined(__WXPM__)
+    #include "wx/os2/popupwin.h"
+#elif defined(__WXGTK20__)

     #include "wx/gtk/popupwin.h"
     #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(__WXDFB__)
+    #include "wx/dfb/popupwin.h"
+#elif defined(__WXMGL__)

     #include "wx/mgl/popupwin.h"
     #include "wx/mgl/popupwin.h"

+#elif defined(__WXMAC__)
+    #include "wx/mac/popupwin.h"

 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif


@@ -66,6 +79,9 @@ public:
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 
 // when the user clicks mouse outside it or if it loses focus in any other way
 // ----------------------------------------------------------------------------
 

+class WXDLLIMPEXP_FWD_CORE wxPopupWindowHandler;
+class WXDLLIMPEXP_FWD_CORE wxPopupFocusHandler;
+

 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:
 class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 {
 public:


@@ -82,11 +98,20 @@ public:
     // hide the window
     virtual void Dismiss();
 
     // 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);
 
     // 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();
 protected:
     // common part of all ctors
     void Init();


@@ -101,14 +126,31 @@ protected:
     // remove our event handlers
     void PopHandlers();
 
     // 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;
 
     // 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;
     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__)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -117,15 +159,16 @@ protected:
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
 // ----------------------------------------------------------------------------
 
 // 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
 {
 public:
 
 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();
 
     // position the window correctly relatively to the combo
     void PositionNearCombo();


@@ -134,8 +177,14 @@ protected:
     // notify the combo here
     virtual void OnDismiss();
 
     // notify the combo here
     virtual void OnDismiss();
 

+    // forward the key presses to the combobox
+    void OnKeyDown(wxKeyEvent& event);
+

     // the parent combobox
     // the parent combobox

-    wxComboControl *m_combo;
+    wxComboCtrl *m_combo;
+
+    DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)

 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)


@@ -143,4 +192,3 @@ protected:
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_
 #endif // wxUSE_POPUPWIN
 
 #endif // _WX_POPUPWIN_H_BASE_

-