X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f41d601565ed8fef859133519e90e8793dc7372..6e33b9aa264c805434f8cb6174e918bf093fe989:/include/wx/popupwin.h

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 4c00cc1ed9..3d9bb5e966 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -13,13 +13,12 @@
 #define _WX_POPUPWIN_H_BASE_
 
 #ifdef __GNUG__
-    #pragma interface "popupwin.h"
+    #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,9 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
+#ifdef __DARWIN__
+    virtual ~wxPopupWindowBase() { }
+#endif
 
     // create the popup window
     //
@@ -47,11 +49,16 @@ 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 __WXMGL__
+    #include "wx/mgl/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
@@ -66,7 +73,7 @@ class WXDLLEXPORT wxPopupTransientWindow : public wxPopupWindow
 public:
     // ctors
     wxPopupTransientWindow() { Init(); }
-    wxPopupTransientWindow(wxWindow *parent);
+    wxPopupTransientWindow(wxWindow *parent, int style = wxBORDER_NONE);
 
     virtual ~wxPopupTransientWindow();
 
@@ -104,9 +111,11 @@ protected:
 
     friend class wxPopupWindowHandler;
     friend class wxPopupFocusHandler;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
 };
 
-#if wxUSE_COMBOBOX
+#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 // ----------------------------------------------------------------------------
 // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox
@@ -118,6 +127,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
+    wxPopupComboWindow() { m_combo = NULL; }
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
@@ -131,9 +141,11 @@ protected:
 
     // the parent combobox
     wxComboControl *m_combo;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };
 
-#endif // wxUSE_COMBOBOX
+#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
 
 #endif // wxUSE_POPUPWIN