X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8132cd4b1ba51f6dba640b04b12ba356180828a..78500b7db1287068a04469e1ce92b4fe99e4e4f0:/src/common/popupcmn.cpp diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index ae9ab6392e..0da4939868 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -40,6 +40,18 @@ #include "wx/univ/renderer.h" #endif // __WXUNIVERSAL__ +// there is no src/{msw,mgl}/popupwin.cpp to put this in, so we do it here - BTW we +// probably could do it for all ports here just as well +#if defined(__WXMSW__) || defined(__WXMGL__) + IMPLEMENT_DYNAMIC_CLASS(wxPopupWindow, wxWindow) +#endif // __WXMSW__ + +IMPLEMENT_DYNAMIC_CLASS(wxPopupTransientWindow, wxPopupWindow) + +#if wxUSE_COMBOBOX && defined(__WXUNIVERSAL__) + IMPLEMENT_DYNAMIC_CLASS(wxPopupComboWindow, wxPopupTransientWindow) +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -96,6 +108,11 @@ END_EVENT_TABLE() // wxPopupWindowBase // ---------------------------------------------------------------------------- +wxPopupWindowBase::~wxPopupWindowBase() +{ + // this destructor is required for Darwin +} + bool wxPopupWindowBase::Create(wxWindow* WXUNUSED(parent), int WXUNUSED(flags)) { return TRUE; @@ -147,11 +164,11 @@ void wxPopupTransientWindow::Init() m_focus = (wxWindow *)NULL; } -wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent) +wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style) { Init(); - (void)Create(parent); + (void)Create(parent, style); } wxPopupTransientWindow::~wxPopupTransientWindow() @@ -354,3 +371,4 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event) } #endif // wxUSE_POPUPWIN +