Cast both operands of ?: to (wxControl*) so BC++ compiles it

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index dca2a4e76da8f3c22c3619f55f79f48863a147f4..df8e2d745d37951bc5a4d7ec9cade0538adfe6e6 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -288,12 +288,12 @@ void wxCalendarCtrl::ShowCurrentControls()
 
 wxControl *wxCalendarCtrl::GetMonthControl() const
 {
 
 wxControl *wxCalendarCtrl::GetMonthControl() const
 {

-    return AllowMonthChange() ? m_comboMonth : m_staticMonth;
+    return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth;

 }
 
 wxControl *wxCalendarCtrl::GetYearControl() const
 {
 }
 
 wxControl *wxCalendarCtrl::GetYearControl() const
 {

-    return AllowYearChange() ? m_spinYear : m_staticYear;
+    return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear;

 }
 
 void wxCalendarCtrl::EnableYearChange(bool enable)
 }
 
 void wxCalendarCtrl::EnableYearChange(bool enable)