Allow wxSplitterWindow::Initialize(NULL) in case we've deleted both child

[wxWidgets.git] / src / generic / calctrl.cpp

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index bf6dea6c5ee28cc3e27fdacfcccb5634b287bc31..bce1b1167d3658311930baed4d92e26ec9551fcd 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -321,6 +321,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
     // above it
     SetSize(pos.x, pos.y, sizeReal.x, sizeReal.y);
 
+    SetForegroundColour(*wxBLACK);
     SetBackgroundColour(*wxWHITE);
     SetFont(*wxSWISS_FONT);
 
@@ -668,11 +669,9 @@ bool wxCalendarCtrl::IsDateShown(const wxDateTime& date) const
 
 bool wxCalendarCtrl::IsDateInRange(const wxDateTime& date) const
 {
-    bool retval = TRUE;
     // Check if the given date is in the range specified
-    retval = ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE )
+    return ( ( ( m_lowdate.IsValid() ) ? ( date >= m_lowdate ) : TRUE )
         && ( ( m_highdate.IsValid() ) ? ( date <= m_highdate ) : TRUE ) );
-    return retval;
 }
 
 bool wxCalendarCtrl::ChangeYear(wxDateTime* target) const
@@ -1371,7 +1370,7 @@ bool wxCalendarCtrl::GetDateCoord(const wxDateTime& date, int *day, int *week) c
         }
         else
         {
-            day += ( startOnMonday ) ? 0 : 1;
+            *day += ( startOnMonday ) ? 0 : 1;
         }
 
         int targetmonth = date.GetMonth() + (12 * date.GetYear());