fixing rti

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 3d0e5c5c48b215f04168ba8fb21d58605a5888d3..0f7befea19441e94d0900c4395a97177e2c21ca7 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -81,7 +81,11 @@ wxFLAGS_MEMBER(wxCB_DROPDOWN)
 
 wxEND_FLAGS( wxComboBoxStyle )
 
+#ifdef __WXUNIVERSAL__
+wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxControl, "wx/combobox.h")
+#else
 wxIMPLEMENT_DYNAMIC_CLASS_XTI(wxComboBox, wxChoice, "wx/combobox.h")
+#endif
 
 wxBEGIN_PROPERTIES_TABLE(wxComboBox)
 wxEVENT_PROPERTY( Select, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent )

diff --git a/src/generic/calctrlg.cpp b/src/generic/calctrlg.cpp
index 3bb4170e5f52bb4f7edcf11b110ed5c2714ec20a..b7f7a0e6f592829a731eb153f6c9c929a354b3d2 100644 (file)
--- a/src/generic/calctrlg.cpp
+++ b/src/generic/calctrlg.cpp
@@ -47,6 +47,12 @@
 // wxWin macros
 // ----------------------------------------------------------------------------
 
+#if wxHAS_NATIVE_CALENDARCTRL
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGenericCalendarCtrl, wxControl,"wx/calctrl.h")
+
+#endif
+
 BEGIN_EVENT_TABLE(wxGenericCalendarCtrl, wxControl)
     EVT_PAINT(wxGenericCalendarCtrl::OnPaint)