Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Ricardo Pedroso that fixes a segfault when the

Browse Source 
wxCAL_SEQUENTIAL_MONTH_SELECTION style is used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-05-26 17:33:41 +00:00
parent 096ed1c628
commit 311b8d3db7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/generic/calctrl.cpp
View File

@@ -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;