X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6522713c7527e5f683a107dff8f40e3ea19a4745..ff1865910312d960737474a75a77737d5ce94864:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index 9774f8e23b..7a666aaf7d 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -29,6 +29,9 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow { public: wxPopupWindowBase() { } +#ifdef __DARWIN__ + virtual ~wxPopupWindowBase() { } +#endif // create the popup window // @@ -52,6 +55,8 @@ public: #include "wx/msw/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 @@ -106,7 +111,7 @@ protected: friend class wxPopupFocusHandler; }; -#if wxUSE_COMBOBOX +#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox @@ -133,7 +138,7 @@ protected: wxComboControl *m_combo; }; -#endif // wxUSE_COMBOBOX +#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) #endif // wxUSE_POPUPWIN