fixed paper size calculation (convert from 10ths of mm to mm correctly)

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index e6341247b39aa1b4468dec9d93aeb73ea56b5408..14c60e526734892fd0fdeb3f432daa230ba11a30 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -121,7 +121,7 @@ wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl *cal)
                             wxDefaultPosition,
                             wxDefaultSize,
                             0, NULL,
                             wxDefaultPosition,
                             wxDefaultSize,
                             0, NULL,

-                            wxCB_READONLY)
+                            wxCB_READONLY | wxCLIP_SIBLINGS)

 {
     m_cal = cal;
 
 {
     m_cal = cal;
 


@@ -140,7 +140,7 @@ wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
                            cal->GetDate().Format(_T("%Y")),
                            wxDefaultPosition,
                            wxDefaultSize,
                            cal->GetDate().Format(_T("%Y")),
                            wxDefaultPosition,
                            wxDefaultSize,

-                           wxSP_ARROW_KEYS,
+                           wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,

                            -4300, 10000, cal->GetDate().GetYear())
 {
     m_cal = cal;
                            -4300, 10000, cal->GetDate().GetYear())
 {
     m_cal = cal;


@@ -169,9 +169,8 @@ void wxCalendarCtrl::Init()
         m_attrs[n] = NULL;
     }
 
         m_attrs[n] = NULL;
     }
 

-    wxSystemSettings ss;
-    m_colHighlightFg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
-    m_colHighlightBg = ss.GetSystemColour(wxSYS_COLOUR_HIGHLIGHT);
+    m_colHighlightFg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    m_colHighlightBg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);

 
     m_colHolidayFg = *wxRED;
     // don't set m_colHolidayBg - by default, same as our bg colour
 
     m_colHolidayFg = *wxRED;
     // don't set m_colHolidayBg - by default, same as our bg colour


@@ -189,7 +188,8 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
                             const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size,
                             const wxString& name)
 {
     if ( !wxControl::Create(parent, id, pos, size,

-                            style | wxWANTS_CHARS, wxDefaultValidator, name) )
+                            style | wxCLIP_CHILDREN | wxWANTS_CHARS,
+                            wxDefaultValidator, name) )

     {
         return FALSE;
     }
     {
         return FALSE;
     }


@@ -824,7 +824,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
 
         // Get extent of month-name + year
         wxCoord monthw, monthh;
 
         // Get extent of month-name + year
         wxCoord monthw, monthh;

-        wxString headertext = m_date.Format("%B %Y");
+        wxString headertext = m_date.Format(wxT("%B %Y"));

         dc.GetTextExtent(headertext, &monthw, &monthh);
 
         // draw month-name centered above weekdays
         dc.GetTextExtent(headertext, &monthw, &monthh);
 
         // draw month-name centered above weekdays