projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding compiling (but not yet working) taskbar implementation for OS X Cocoa, mostly...
[wxWidgets.git]
/
include
/
wx
/
datectrl.h
diff --git
a/include/wx/datectrl.h
b/include/wx/datectrl.h
index 76a6ffb332006c2cbf3776a80af6be3ebbc227d0..81f6c0d62eaac9b34070cc775726c0e8ec8217ec 100644
(file)
--- a/
include/wx/datectrl.h
+++ b/
include/wx/datectrl.h
@@
-35,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
};
// ----------------------------------------------------------------------------
};
// ----------------------------------------------------------------------------
@@
-70,7
+74,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
@@
-87,14
+95,14
@@
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