Applied patch [ 677730 ] Menus with radio items (wxUniv)

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index 0352b4c2f52daf11fb603beb2d70344a0e24679d..2965710e118170ce3ee235ef3a9b47c2beaa67e6 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -34,6 +34,7 @@
     #include "wx/brush.h"
     #include "wx/combobox.h"
     #include "wx/stattext.h"
+    #include "wx/textctrl.h"
 #endif //WX_PRECOMP
 
 #if wxUSE_CALENDARCTRL
@@ -59,6 +60,7 @@ private:
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxMonthComboBox)
 };
 
 class wxYearSpinCtrl : public wxSpinCtrl
@@ -73,6 +75,7 @@ private:
     wxCalendarCtrl *m_cal;
 
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxYearSpinCtrl)
 };
 
 // ----------------------------------------------------------------------------
@@ -146,6 +149,7 @@ wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
                            wxDefaultSize,
                            wxSP_ARROW_KEYS | wxCLIP_SIBLINGS,
                            -4300, 10000, cal->GetDate().GetYear())
+
 {
     m_cal = cal;
 }
@@ -154,6 +158,19 @@ wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl *cal)
 // wxCalendarCtrl
 // ----------------------------------------------------------------------------
 
+wxCalendarCtrl::wxCalendarCtrl(wxWindow *parent,
+                   wxWindowID id,
+                   const wxDateTime& date,
+                   const wxPoint& pos,
+                   const wxSize& size,
+                   long style,
+                   const wxString& name)
+{
+    Init();
+    
+    (void)Create(parent, id, date, pos, size, style, name);
+}
+
 void wxCalendarCtrl::Init()
 {
     m_comboMonth = NULL;
@@ -741,9 +758,39 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
     {
         wxSize sizeCombo = m_comboMonth->GetSize();
         wxSize sizeStatic = m_staticMonth->GetSize();
-
+        wxSize sizeSpin = m_spinYear->GetSize();
         int dy = (sizeCombo.y - sizeStatic.y) / 2;
-
+/*
+In the calender the size of the combobox for the year 
+is just defined by a margin from the month combobox to 
+the left border. While in wxUniv the year control can't 
+show all 4 digits, in wxMsw it show almost twice as 
+much. Instead the year should use it's best size and be 
+left aligned to the calendar. Just in case the month in 
+any language is longer than it has space in the 
+calendar it is shortend.This way the year always can 
+show the 4 digits. 
+
+This patch relies on the fact that a combobox has a 
+good best size implementation. This is not the case 
+with wxMSW but I don't know why.
+
+Otto Wyss
+*/
+
+#ifdef __WXUNIVERSAL__
+        if (sizeCombo.x + HORZ_MARGIN - sizeSpin.x > width)
+        {
+            m_comboMonth->SetSize(x, y, width - HORZ_MARGIN - sizeSpin.x, sizeCombo.y);
+        }
+        else
+        {
+            m_comboMonth->Move(x, y);
+        }
+        m_staticMonth->Move(x, y + dy);
+        m_spinYear->Move(x + width - sizeSpin.x, y);
+        m_staticYear->Move(x + width - sizeSpin.x, y + dy);
+#else
         m_comboMonth->Move(x, y);
         m_staticMonth->SetSize(x, y + dy, sizeCombo.x, sizeStatic.y);
 
@@ -751,8 +798,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 
         m_spinYear->SetSize(x + xDiff, y, width - xDiff, sizeCombo.y);
         m_staticYear->SetSize(x + xDiff, y + dy, width - xDiff, sizeStatic.y);
-
-        wxSize sizeSpin = m_spinYear->GetSize();
+#endif
         yDiff = wxMax(sizeSpin.y, sizeCombo.y) + VERT_MARGIN;
     }
     else // no controls on the top
@@ -1555,7 +1601,7 @@ void wxCalendarCtrl::OnYearChange(wxCommandEvent& event)
 void wxCalendarCtrl::OnChar(wxKeyEvent& event)
 {
     wxDateTime target;
-    switch ( event.KeyCode() )
+    switch ( event.GetKeyCode() )
     {
         case _T('+'):
         case WXK_ADD: