preparation for separated menu items

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

diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index accdde8d5d9610b81fe83a78497d7df3574d4849..55862dea2d6aea68c7c73cacec40f6910e002219 100644 (file)
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -28,9 +28,7 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow
 {
 public:
     wxPopupWindowBase() { }
-#ifdef __DARWIN__
-    virtual ~wxPopupWindowBase() { }
-#endif
+    virtual ~wxPopupWindowBase();
 
     // create the popup window
     //
@@ -111,6 +109,8 @@ protected:
 
     friend class wxPopupWindowHandler;
     friend class wxPopupFocusHandler;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupTransientWindow)
 };
 
 #if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)
@@ -125,6 +125,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
+    wxPopupComboWindow() { m_combo = NULL; }
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
@@ -138,6 +139,8 @@ protected:
 
     // the parent combobox
     wxComboControl *m_combo;
+
+    DECLARE_DYNAMIC_CLASS(wxPopupComboWindow)
 };
 
 #endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__)