compilation fix after wxPlatformInfo patch: use wxOS_WINDOWS_CE instead of wxWinPocketPC

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

diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp
index e5e98717bc626f66e9eebd949c3fbf953bbd1b87..59b083f668fdcbed7937fa04856b7e4e40c427b8 100644 (file)
--- a/src/generic/calctrl.cpp
+++ b/src/generic/calctrl.cpp
@@ -790,7 +790,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 
     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
     {
 
     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && m_staticMonth )
     {

-        wxSize sizeCombo = m_comboMonth->GetSize();
+        wxSize sizeCombo = m_comboMonth->GetBestFittingSize();

         wxSize sizeStatic = m_staticMonth->GetSize();
         wxSize sizeSpin = m_spinYear->GetSize();
 
         wxSize sizeStatic = m_staticMonth->GetSize();
         wxSize sizeSpin = m_spinYear->GetSize();
 


@@ -826,7 +826,7 @@ void wxCalendarCtrl::DoMoveWindow(int x, int y, int width, int height)
 void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
 {
     wxControl::DoGetPosition(x, y);
 void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
 {
     wxControl::DoGetPosition(x, y);

-
+#ifndef __WXPM__

     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )
     {
         // our real top corner is not in this position
     if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) && GetMonthControl() )
     {
         // our real top corner is not in this position


@@ -835,13 +835,14 @@ void wxCalendarCtrl::DoGetPosition(int *x, int *y) const
             *y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }
             *y -= GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }

+#endif

 }
 
 void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 {
     wxControl::DoGetSize(width, height);
 }
 
 void wxCalendarCtrl::DoGetSize(int *width, int *height) const
 {
     wxControl::DoGetSize(width, height);

-
-    if ( !(GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) )
+#ifndef __WXPM__
+    if ( !HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) )

     {
         // our real height is bigger
         if ( height && GetMonthControl())
     {
         // our real height is bigger
         if ( height && GetMonthControl())


@@ -849,6 +850,7 @@ void wxCalendarCtrl::DoGetSize(int *width, int *height) const
             *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }
             *height += GetMonthControl()->GetSize().y + VERT_MARGIN;
         }
     }

+#endif

 }
 
 void wxCalendarCtrl::RecalcGeometry()
 }
 
 void wxCalendarCtrl::RecalcGeometry()


@@ -886,7 +888,7 @@ void wxCalendarCtrl::RecalcGeometry()
     m_widthCol += 2;
     m_heightRow += 2;
 
     m_widthCol += 2;
     m_heightRow += 2;
 

-    m_rowOffset = (GetWindowStyle() & wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style
+    m_rowOffset = HasFlag(wxCAL_SEQUENTIAL_MONTH_SELECTION) ? m_heightRow : 0; // conditional in relation to style

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------