MSVC 5 fix.

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 9774f8e23b247d44b7d5c0b7e43a2a2137db6af0..18ca40e2f31ebe97ec74e37a072b8f6d93417814 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -6,20 +6,19 @@
 // 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__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "popupwinbase.h"
 #endif
 
 #include "wx/window.h"
 
 #if wxUSE_POPUPWIN
-
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
@@ -29,6 +28,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
+    virtual ~wxPopupWindowBase();
 
     // create the popup window
     //
@@ -45,13 +45,26 @@ 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__
     #include "wx/msw/popupwin.h"
+#elif __WXPM__
+    #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
+#elif __WXX11__
+    #include "wx/x11/popupwin.h"
+#elif __WXMOTIF__
+    #include "wx/motif/popupwin.h"
+#elif __WXMGL__
+    #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
@@ -61,12 +74,15 @@ 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:
     // ctors
     wxPopupTransientWindow() { Init(); }
-    wxPopupTransientWindow(wxWindow *parent);
+    wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
 
     virtual ~wxPopupTransientWindow();
 
@@ -77,6 +93,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)
@@ -102,11 +124,19 @@ 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
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
@@ -118,6 +148,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
+    wxPopupComboWindow() { m_combo = NULL; }
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
@@ -129,11 +160,17 @@ 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)
 };
 
-#endif // wxUSE_COMBOBOX
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 #endif // wxUSE_POPUPWIN