AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed wxOSX conditional code from generic calendar control.

Browse Source 
Tested the calendar sample with Cocoa and Carbon to determine the behaviour and looks are still the same.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth 2011-04-17 21:47:56 +00:00
parent 01d420639e
commit f0cc899914
1 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/generic/calctrlg.cpp
View File

@ -287,9 +287,6 @@ void wxGenericCalendarCtrl::CreateYearSpinCtrl()
wxDefaultSize,
wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
-4300, 10000, GetDate().GetYear());
#ifdef __WXMAC__
m_spinYear->SetSize( 90, -1 );
#endif
m_spinYear->Connect(m_spinYear->GetId(), wxEVT_COMMAND_TEXT_UPDATED,
wxCommandEventHandler(wxGenericCalendarCtrl::OnYearTextChange),
@ -700,10 +697,6 @@ wxSize wxGenericCalendarCtrl::DoGetBestSize() const
height += wxMax(bestSizeCombo.y, m_spinYear->GetBestSize().y)
+ VERT_MARGIN;
#ifdef __WXMAC__
// the spin control get clipped otherwise
width += 25;
#endif
wxCoord w2 = bestSizeCombo.x + HORZ_MARGIN + GetCharWidth()*8;
if ( width < w2 )
@ -733,11 +726,7 @@ void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
int maxHeight = wxMax(sizeSpin.y, sizeCombo.y);
int dy = (maxHeight - sizeStatic.y) / 2;
#ifdef __WXMAC__
m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2 + 2); // FIXME, something is reporting the wrong size..
#else
m_comboMonth->Move(x, y + (maxHeight - sizeCombo.y)/2);
#endif
m_staticMonth->SetSize(x, y + dy, sizeCombo.x, -1);
int xDiff = sizeCombo.x + HORZ_MARGIN;
@ -757,20 +746,7 @@ void wxGenericCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
void wxGenericCalendarCtrl::DoGetSize(int *width, int *height) const
{
#ifdef __WXMAC__
wxControl::DoGetSize( width, height );
if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth && height )
{
wxSize sizeCombo = m_comboMonth->GetEffectiveMinSize();
wxSize sizeSpin = m_spinYear->GetSize();
int maxHeight = wxMax(sizeSpin.y, sizeCombo.y);
*height += maxHeight + VERT_MARGIN;
}
#else
wxControl::DoGetSize( width, height );
#endif
}
void wxGenericCalendarCtrl::RecalcGeometry()