X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9cdd31d8176e8fc5abe07feafedd16043d63de1..e1218bd636881ea42715c64b5da9c926ce2d74ec:/include/wx/popupwin.h diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h index ea63c1484b..accdde8d5d 100644 --- 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,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();