From: Ove Kaaven <ovek@arcticnet.no>
Date: Mon, 3 Jan 2000 19:31:02 +0000 (+0000)
Subject: Cast both operands of ?: to (wxControl*) so BC++ compiles it
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/380d9d629761098171c4b6e4f7d1df0c318c80f8?ds=sidebyside

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 dca2a4e76d..df8e2d745d 100644
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -288,12 +288,12 @@ void wxCalendarCtrl::ShowCurrentControls()
 
 wxControl *wxCalendarCtrl::GetMonthControl() const
 {
-    return AllowMonthChange() ? m_comboMonth : m_staticMonth;
+    return AllowMonthChange() ? (wxControl *)m_comboMonth : (wxControl *)m_staticMonth;
 }
 
 wxControl *wxCalendarCtrl::GetYearControl() const
 {
-    return AllowYearChange() ? m_spinYear : m_staticYear;
+    return AllowYearChange() ? (wxControl *)m_spinYear : (wxControl *)m_staticYear;
 }
 
 void wxCalendarCtrl::EnableYearChange(bool enable)