X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..9fe52545f5b4a21e3cdeab5d0aa8d9e6a91355c3:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index f4c0521e49..bd9524c08f 100644 --- a/include/wx/popupwin.h +++ b/include/wx/popupwin.h @@ -13,7 +13,7 @@ #define _WX_POPUPWIN_H_BASE_ #ifdef __GNUG__ - #pragma interface "popupwin.h" + #pragma interface "popupwinbase.h" #endif #include "wx/window.h" @@ -29,6 +29,9 @@ class WXDLLEXPORT wxPopupWindowBase : public wxWindow { public: wxPopupWindowBase() { } +#ifdef __DARWIN__ + virtual ~wxPopupWindowBase() { } +#endif // create the popup window // @@ -50,6 +53,8 @@ public: // include the real class declaration #ifdef __WXMSW__ #include "wx/msw/popupwin.h" +#elif __WXGTK__ + #include "wx/gtk/popupwin.h" #else #error "wxPopupWindow is not supported under this platform." #endif @@ -104,7 +109,7 @@ protected: friend class wxPopupFocusHandler; }; -#if wxUSE_COMBOBOX +#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) // ---------------------------------------------------------------------------- // wxPopupComboWindow: wxPopupTransientWindow used by wxComboBox @@ -131,7 +136,7 @@ protected: wxComboControl *m_combo; }; -#endif // wxUSE_COMBOBOX +#endif // wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) #endif // wxUSE_POPUPWIN