From: Robin Dunn <robin@alldunn.com>
Date: Thu, 26 May 2005 17:33:41 +0000 (+0000)
Subject: Patch from Ricardo Pedroso that fixes a segfault when the
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/311b8d3db7f6e723408a7ed9bbc72cac0a682701?ds=inline

Patch from Ricardo Pedroso that fixes a segfault when the
wxCAL_SEQUENTIAL_MONTH_SELECTION style is used.


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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 92fb7051e9..13645353de 100644
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -753,11 +753,12 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
         // the combobox doesn't report its height correctly (it returns the
         // height including the drop down list) so don't use it
         height += m_spinYear->GetBestSize().y;
-    }
+
 
 	wxCoord w2= m_comboMonth->GetBestSize().x + HORZ_MARGIN + GetCharWidth()*6;
 	if (width < w2)
 	  width=w2;
+    }
 
     if ( !HasFlag(wxBORDER_NONE) )
     {
@@ -891,7 +892,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
         dc.SetTextForeground(*wxBLACK);
         dc.SetBrush(wxBrush(m_colHeaderBg, wxSOLID));
         dc.SetPen(wxPen(m_colHeaderBg, 1, wxSOLID));
-        dc.DrawRectangle(x0, y, GetClientSize().x, m_heightRow);
+        dc.DrawRectangle(0, y, GetClientSize().x, m_heightRow);
 
         // Get extent of month-name + year
         wxCoord monthw, monthh;