use margin width after updating it in OnMeasureItem() (see #10452)

[wxWidgets.git] / src / palmos / datectrl.cpp

diff --git a/src/palmos/datectrl.cpp b/src/palmos/datectrl.cpp
index 79f890156c422c4ee5687d3527fa12386b2075c0..a351bb2777c7c3106e475fb4d7fc3051e510698f 100644 (file)
--- a/src/palmos/datectrl.cpp
+++ b/src/palmos/datectrl.cpp
@@ -23,19 +23,22 @@
     #pragma hdrstop
 #endif
 
-#ifndef WX_PRECOMP
-#endif
-
 #if wxUSE_DATEPICKCTRL
 
 #include "wx/datectrl.h"
-#include "wx/app.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/app.h"
+#endif
+
 #include "wx/dynlib.h"
 
-#define _WX_DEFINE_DATE_EVENTS_
 #include "wx/dateevt.h"
 
+#include <Control.h>
+#include <SelDay.h>
+
 IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
 
 // ============================================================================
@@ -115,17 +118,19 @@ bool wxDatePickerCtrl::GetRange(wxDateTime *dt1, wxDateTime *dt2) const
 
 bool wxDatePickerCtrl::SendClickEvent()
 {
-    int16_t month = m_dt.GetMonth();
+    int16_t month = (int16_t)m_dt.GetMonth() + 1;
     int16_t day = m_dt.GetDay();
     int16_t year = m_dt.GetYear();
 
-    if(!SelectDay(selectDayByDay,&month,&day,&year,_T("Pick date")))
+    //if(!SelectDay(selectDayByDay,&month,&day,&year,_T("Pick date")))
+    if(!SelectDay(selectDayByDay,&month,&day,&year, "Pick date"))
         return false;
     wxDateTime dt(m_dt);
-    dt.Set((wxDateTime::wxDateTime_t)day, (wxDateTime::Month)month, (int)year);
+    dt.Set((wxDateTime::wxDateTime_t)day,
+           (wxDateTime::Month)(month-1),
+           (int)year);
     SetValue(dt);
     return true;
 }
 
 #endif // wxUSE_DATEPICKCTRL
-