another wxUSE_DRAG_AND_DROP==0 compilation fix

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

diff --git a/include/wx/datectrl.h b/include/wx/datectrl.h
index 834ec21a01a7b203cded4780106c261bf04c8466..81f6c0d62eaac9b34070cc775726c0e8ec8217ec 100644 (file)
--- a/include/wx/datectrl.h
+++ b/include/wx/datectrl.h
@@ -12,6 +12,10 @@
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 
 #ifndef _WX_DATECTRL_H_
 #define _WX_DATECTRL_H_
 

+#include "wx/defs.h"
+
+#if wxUSE_DATEPICKCTRL
+

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


@@ -31,7 +35,11 @@ enum
 
     // always show century in the default date display (otherwise it depends on
     // the system date format which may include the century or not)
 
     // always show century in the default date display (otherwise it depends on
     // the system date format which may include the century or not)

-    wxDP_SHOWCENTURY = 4
+    wxDP_SHOWCENTURY = 4,
+
+    // allow not having any valid date in the control (by default it always has
+    // some date, today initially if no valid date specified in ctor)
+    wxDP_ALLOWNONE = 8

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -66,8 +74,14 @@ 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"
     #include "wx/msw/datectrl.h"

+
+    #define wxHAS_NATIVE_DATEPICKCTRL

 #else
     #include "wx/generic/datectrl.h"
 
 #else
     #include "wx/generic/datectrl.h"
 


@@ -81,16 +95,18 @@ public:
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
                          const wxPoint& pos = wxDefaultPosition,
                          const wxSize& size = wxDefaultSize,
                          long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,

+                         const wxValidator& validator = wxDefaultValidator,

                          const wxString& name = wxDatePickerCtrlNameStr)
                          const wxString& name = wxDatePickerCtrlNameStr)

-            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, name)
+            : wxDatePickerCtrlGeneric(parent, id, date, pos, size, style, validator, name)

         {
         }
 
     private:
         {
         }
 
     private:

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

     };
 #endif
 
     };
 #endif
 

+#endif // wxUSE_DATEPICKCTRL
+

 #endif // _WX_DATECTRL_H_
 
 #endif // _WX_DATECTRL_H_