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

Applied patch [ 1207531 ] Fix for wxCalendarCtrl being UNUSABLE with some languages

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-05-30 08:45:59 +00:00
parent 3168b4c3ae
commit f6f735d3c2
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/generic/calctrl.cpp
View File

@@ -840,10 +840,22 @@ void wxCalendarCtrl::RecalcGeometry()
wxClientDC dc(this); wxClientDC dc(this);
dc.SetFont(GetFont()); dc.SetFont(GetFont());
int day = 10;
// determine the column width (we assume that the weekday names are always // determine the column width (weekday names are not necessarily wider
// wider (in any language) than the numbers) // than the numbers (in some languages), so let's not assume that they are)
m_widthCol = 0; m_widthCol = 0;
for ( day = 10; day <= 31; day++)
{
wxCoord width;
dc.GetTextExtent(wxString::Format(wxT("%d"), day), &width, &m_heightRow);
if ( width > m_widthCol )
{
// 1.5 times the width gives nice margins even if the weekday
// names are short
m_widthCol = width+width/2;
}
}
wxDateTime::WeekDay wd; wxDateTime::WeekDay wd;
for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) ) for ( wd = wxDateTime::Sun; wd < wxDateTime::Inv_WeekDay; wxNextWDay(wd) )
{ {