Fixes for GNUPro 00r1

[wxWidgets.git] / src / common / popupcmn.cpp

diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp
index ae9ab6392e7458f9c5786b0e34c95ba3dd65d93a..ff6d0c08181a466027c0f28a38cd5ef88a73d87e 100644 (file)
--- a/src/common/popupcmn.cpp
+++ b/src/common/popupcmn.cpp
@@ -40,6 +40,18 @@
     #include "wx/univ/renderer.h"
 #endif // __WXUNIVERSAL__
 
     #include "wx/univ/renderer.h"
 #endif // __WXUNIVERSAL__
 

+// there is no src/msw/popupwin.cpp to put this in, so we do it here - BTW we
+// probably could do it for all ports here just as well
+#ifdef __WXMSW__
+    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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -147,11 +159,11 @@ void wxPopupTransientWindow::Init()
     m_focus = (wxWindow *)NULL;
 }
 
     m_focus = (wxWindow *)NULL;
 }
 

-wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent)
+wxPopupTransientWindow::wxPopupTransientWindow(wxWindow *parent, int style)

 {
     Init();
 
 {
     Init();
 

-    (void)Create(parent);
+    (void)Create(parent, style);

 }
 
 wxPopupTransientWindow::~wxPopupTransientWindow()
 }
 
 wxPopupTransientWindow::~wxPopupTransientWindow()


@@ -354,3 +366,4 @@ void wxPopupFocusHandler::OnKillFocus(wxFocusEvent& event)
 }
 
 #endif // wxUSE_POPUPWIN
 }
 
 #endif // wxUSE_POPUPWIN

+