Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/palmos/datectrl.cpp b/src/palmos/datectrl.cpp
index 88206bc61b12085718430c899b28b81c4fd5d7ad..e58d7149006d938e58964801ae87282718328f62 100644 (file)
--- a/src/palmos/datectrl.cpp
+++ b/src/palmos/datectrl.cpp
@@ -23,19 +23,22 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-#endif
-

 #if wxUSE_DATEPICKCTRL
 
 #include "wx/datectrl.h"
 #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"
 
 #include "wx/dynlib.h"
 

-#define _WX_DEFINE_DATE_EVENTS_

 #include "wx/dateevt.h"
 
 #include "wx/dateevt.h"
 

+#include <Control.h>
+#include <SelDay.h>
+

 IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
 
 // ============================================================================
 IMPLEMENT_DYNAMIC_CLASS(wxDatePickerCtrl, wxControl)
 
 // ============================================================================


@@ -119,7 +122,8 @@ bool wxDatePickerCtrl::SendClickEvent()
     int16_t day = m_dt.GetDay();
     int16_t year = m_dt.GetYear();
 
     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,wxT("Pick date")))
+    if(!SelectDay(selectDayByDay,&month,&day,&year, "Pick date"))

         return false;
     wxDateTime dt(m_dt);
     dt.Set((wxDateTime::wxDateTime_t)day,
         return false;
     wxDateTime dt(m_dt);
     dt.Set((wxDateTime::wxDateTime_t)day,


@@ -130,4 +134,3 @@ bool wxDatePickerCtrl::SendClickEvent()
 }
 
 #endif // wxUSE_DATEPICKCTRL
 }
 
 #endif // wxUSE_DATEPICKCTRL

-