fixed wxString iterators linked list corruption

[wxWidgets.git] / include / wx / datectrl.h

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 5a0e6f0e4d6b0be89fbdfc4de2bac90f0ceb8c33..7adfbf775e310a0a33afd0c46e3c681fada497bc 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -16,6 +16,13 @@
 
 #if wxUSE_DATEPICKCTRL
 
 
 #if wxUSE_DATEPICKCTRL
 

+// this is currently defined in wx/msw/setup.h but not for MSW configure builds
+// and other ports which only have the generic version anyhow, so provide a
+// fallback definition here for them
+#ifndef wxUSE_DATEPICKCTRL_GENERIC
+    #define wxUSE_DATEPICKCTRL_GENERIC 0
+#endif
+

 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 
 #include "wx/control.h"         // the base class
 #include "wx/datetime.h"
 


@@ -74,7 +81,11 @@ public:
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 
     virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const = 0;
 };
 

-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+#if defined(__WXPALMOS__)
+    #include "wx/palmos/datectrl.h"
+
+    #define wxHAS_NATIVE_DATEPICKCTRL
+#elif defined(__WXMSW__) && !defined(__WXUNIVERSAL__)

     #include "wx/msw/datectrl.h"
 
     #define wxHAS_NATIVE_DATEPICKCTRL
     #include "wx/msw/datectrl.h"
 
     #define wxHAS_NATIVE_DATEPICKCTRL


@@ -98,8 +109,7 @@ public:
         }
 
     private:
         }
 
     private:

-        DECLARE_DYNAMIC_CLASS(wxDatePickerCtrl)
-        DECLARE_NO_COPY_CLASS(wxDatePickerCtrl)
+        DECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl)

     };
 #endif
 
     };
 #endif