Window management and sizer layout corrections

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index bd9524c08f15121b0d8f22f6e721432d89027963..2de6e2e50db9e24c91b29875355d77551ec02589 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -19,7 +19,6 @@
 #include "wx/window.h"
 
 #if wxUSE_POPUPWIN
-
 // ----------------------------------------------------------------------------
 // wxPopupWindow: a special kind of top level window used for popup menus,
 // combobox popups and such.
@@ -29,9 +28,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindowBase() { }
-#endif
+    virtual ~wxPopupWindowBase();
 
     // create the popup window
     //
@@ -50,11 +47,18 @@ public:
                           const wxSize& size);
 };
 
+
 // 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 __WXMGL__
+    #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
@@ -64,12 +68,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();
 
@@ -105,8 +112,15 @@ 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)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -121,6 +135,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
+    wxPopupComboWindow() { m_combo = NULL; }
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
@@ -134,6 +149,8 @@ protected:
 
     // the parent combobox
     wxComboControl *m_combo;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)