Added wx.DatePickerCtrl

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 980e9e9a5615b527ec49335ce1cae151833f9a88..94d03cb4588b10dfa1a3943dc029aa28fb764187 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -49,6 +49,7 @@ _treeList = [
     ('Recent Additions/Updates', [
         'StandardPaths',
         'MediaCtrl',
     ('Recent Additions/Updates', [
         'StandardPaths',
         'MediaCtrl',

+        'DatePickerCtrl',

         ]),
 
     # managed windows == things with a (optional) caption you can close
         ]),
 
     # managed windows == things with a (optional) caption you can close


@@ -145,6 +146,7 @@ _treeList = [
         'Calendar',
         'CalendarCtrl',
         'ContextHelp',
         'Calendar',
         'CalendarCtrl',
         'ContextHelp',

+        'DatePickerCtrl',

         'DynamicSashWindow',
         'EditableListBox',
         'FancyText',
         'DynamicSashWindow',
         'EditableListBox',
         'FancyText',

diff --git a/wxPython/include/wx/wxPython/wxPython_int.h b/wxPython/include/wx/wxPython/wxPython_int.h
index 3e815983489d1d19de3f32a689bcb41afb5c7449..5d8e6ca56345140bf21f161ea10d44b30337d023 100644 (file)
--- a/wxPython/include/wx/wxPython/wxPython_int.h
+++ b/wxPython/include/wx/wxPython/wxPython_int.h
@@ -67,6 +67,9 @@
 #include <wx/tooltip.h>
 #include <wx/vlbox.h>
 #include <wx/vscroll.h>
 #include <wx/tooltip.h>
 #include <wx/vlbox.h>
 #include <wx/vscroll.h>

+#include <wx/dateevt.h>
+#include <wx/datectrl.h>
+

 
 
 #ifdef _MSC_VER
 
 
 #ifdef _MSC_VER

diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i
index 93f6a21dad6285a3f7e4daf2b4cbd33e9ac9b419..14f05d35e9b6045b29ae4f7387e5d66c40d88fd7 100644 (file)
--- a/wxPython/src/__controls_rename.i
+++ b/wxPython/src/__controls_rename.i
@@ -275,5 +275,11 @@
 %rename(ContextHelpButton)                  wxContextHelpButton;
 %rename(HelpProvider)                       wxHelpProvider;
 %rename(SimpleHelpProvider)                 wxSimpleHelpProvider;
 %rename(ContextHelpButton)                  wxContextHelpButton;
 %rename(HelpProvider)                       wxHelpProvider;
 %rename(SimpleHelpProvider)                 wxSimpleHelpProvider;

+%rename(DP_DEFAULT)                         wxDP_DEFAULT;
+%rename(DP_SPIN)                            wxDP_SPIN;
+%rename(DP_DROPDOWN)                        wxDP_DROPDOWN;
+%rename(DP_SHOWCENTURY)                     wxDP_SHOWCENTURY;
+%rename(DP_ALLOWNONE)                       wxDP_ALLOWNONE;
+%rename(DatePickerCtrl)                     wxDatePickerCtrl;

 
 #endif
 
 #endif

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index 380e9ccec88cdb56507b4264a4329fc52a4f9463..f83a845e5927108688d8035b40c49898d156e7fc 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -581,6 +581,7 @@
 %rename(IdleEvent)                          wxIdleEvent;
 %rename(PyEvent)                            wxPyEvent;
 %rename(PyCommandEvent)                     wxPyCommandEvent;
 %rename(IdleEvent)                          wxIdleEvent;
 %rename(PyEvent)                            wxPyEvent;
 %rename(PyCommandEvent)                     wxPyCommandEvent;

+%rename(DateEvent)                          wxDateEvent;

 %rename(PYAPP_ASSERT_SUPPRESS)              wxPYAPP_ASSERT_SUPPRESS;
 %rename(PYAPP_ASSERT_EXCEPTION)             wxPYAPP_ASSERT_EXCEPTION;
 %rename(PYAPP_ASSERT_DIALOG)                wxPYAPP_ASSERT_DIALOG;
 %rename(PYAPP_ASSERT_SUPPRESS)              wxPYAPP_ASSERT_SUPPRESS;
 %rename(PYAPP_ASSERT_EXCEPTION)             wxPYAPP_ASSERT_EXCEPTION;
 %rename(PYAPP_ASSERT_DIALOG)                wxPYAPP_ASSERT_DIALOG;

diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i
index c72ff6fc2efc8d66e35ec59f1bc5f51e6a221e78..28867cb1635b3f0d6bea4116130bcd22ac278a86 100644 (file)
--- a/wxPython/src/controls.i
+++ b/wxPython/src/controls.i
@@ -60,6 +60,8 @@ MAKE_CONST_WXSTRING_NOSWIG(ControlNameStr);
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i
 %include _pycontrol.i
 %include _cshelp.i
 %include _dragimg.i

+%include _datectrl.i
+

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index c5d9133908deac1496e5397a9d470528fedbaa2d..afae57d2b3074d2fde0c70c003af6d9c9d290a57 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -493,6 +493,15 @@ wxDragIcon = wx._controls.DragIcon
 wxDragString = wx._controls.DragString
 wxDragTreeItem = wx._controls.DragTreeItem
 wxDragListItem = wx._controls.DragListItem
 wxDragString = wx._controls.DragString
 wxDragTreeItem = wx._controls.DragTreeItem
 wxDragListItem = wx._controls.DragListItem

+wxDatePickerCtrlNameStr = wx._controls.DatePickerCtrlNameStr
+wxDP_DEFAULT = wx._controls.DP_DEFAULT
+wxDP_SPIN = wx._controls.DP_SPIN
+wxDP_DROPDOWN = wx._controls.DP_DROPDOWN
+wxDP_SHOWCENTURY = wx._controls.DP_SHOWCENTURY
+wxDP_ALLOWNONE = wx._controls.DP_ALLOWNONE
+wxDatePickerCtrl = wx._controls.DatePickerCtrl
+wxDatePickerCtrlPtr = wx._controls.DatePickerCtrlPtr
+wxPreDatePickerCtrl = wx._controls.PreDatePickerCtrl

 
 
 d = globals()
 
 
 d = globals()

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 20a13e0dd8ecdf26a2f5890f935922f72e089909..217d01a3e44508d301f048399f101b900b553906 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -935,6 +935,9 @@ wxPyEvent = wx._core.PyEvent
 wxPyEventPtr = wx._core.PyEventPtr
 wxPyCommandEvent = wx._core.PyCommandEvent
 wxPyCommandEventPtr = wx._core.PyCommandEventPtr
 wxPyEventPtr = wx._core.PyEventPtr
 wxPyCommandEvent = wx._core.PyCommandEvent
 wxPyCommandEventPtr = wx._core.PyCommandEventPtr

+wxDateEvent = wx._core.DateEvent
+wxDateEventPtr = wx._core.DateEventPtr
+wxEVT_DATE_CHANGED = wx._core.wxEVT_DATE_CHANGED

 wxPYAPP_ASSERT_SUPPRESS = wx._core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx._core.PYAPP_ASSERT_EXCEPTION
 wxPYAPP_ASSERT_DIALOG = wx._core.PYAPP_ASSERT_DIALOG
 wxPYAPP_ASSERT_SUPPRESS = wx._core.PYAPP_ASSERT_SUPPRESS
 wxPYAPP_ASSERT_EXCEPTION = wx._core.PYAPP_ASSERT_EXCEPTION
 wxPYAPP_ASSERT_DIALOG = wx._core.PYAPP_ASSERT_DIALOG