Wrap some deprecation wrappers around newly deprecated items

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

diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i
index 4d6dd18ae8cc518a8de656ef89824ea88500eaff..8b614b1d32e41ac9462f00144224aa2b29b3d7ba 100644 (file)
--- a/wxPython/src/__controls_rename.i
+++ b/wxPython/src/__controls_rename.i
@@ -24,7 +24,6 @@
 %rename(GA_HORIZONTAL)                      wxGA_HORIZONTAL;
 %rename(GA_VERTICAL)                        wxGA_VERTICAL;
 %rename(GA_SMOOTH)                          wxGA_SMOOTH;
-%rename(GA_PROGRESSBAR)                     wxGA_PROGRESSBAR;
 %rename(Gauge)                              wxGauge;
 %rename(StaticBox)                          wxStaticBox;
 %rename(StaticLine)                         wxStaticLine;
@@ -50,7 +49,6 @@
 %rename(TE_CHARWRAP)                        wxTE_CHARWRAP;
 %rename(TE_WORDWRAP)                        wxTE_WORDWRAP;
 %rename(TE_BESTWRAP)                        wxTE_BESTWRAP;
-%rename(TE_LINEWRAP)                        wxTE_LINEWRAP;
 %rename(TE_RICH2)                           wxTE_RICH2;
 %rename(TE_CAPITALIZE)                      wxTE_CAPITALIZE;
 %rename(TEXT_ALIGNMENT_DEFAULT)             wxTEXT_ALIGNMENT_DEFAULT;
@@ -111,6 +109,7 @@
 %rename(BK_LEFT)                            wxBK_LEFT;
 %rename(BK_RIGHT)                           wxBK_RIGHT;
 %rename(BK_ALIGN_MASK)                      wxBK_ALIGN_MASK;
+%rename(BK_BUTTONBAR)                       wxBK_BUTTONBAR;
 %rename(BookCtrlBase)                       wxBookCtrlBase;
 %rename(BookCtrlBaseEvent)                  wxBookCtrlBaseEvent;
 %rename(NB_FIXEDWIDTH)                      wxNB_FIXEDWIDTH;
@@ -249,8 +248,6 @@
 %rename(TR_FULL_ROW_HIGHLIGHT)              wxTR_FULL_ROW_HIGHLIGHT;
 %rename(TR_DEFAULT_STYLE)                   wxTR_DEFAULT_STYLE;
 %rename(TR_TWIST_BUTTONS)                   wxTR_TWIST_BUTTONS;
-%rename(TR_MAC_BUTTONS)                     wxTR_MAC_BUTTONS;
-%rename(TR_AQUA_BUTTONS)                    wxTR_AQUA_BUTTONS;
 %rename(TreeItemIcon_Normal)                wxTreeItemIcon_Normal;
 %rename(TreeItemIcon_Selected)              wxTreeItemIcon_Selected;
 %rename(TreeItemIcon_Expanded)              wxTreeItemIcon_Expanded;

diff --git a/wxPython/src/_functions.i b/wxPython/src/_functions.i
index d9e76c0769f3932e16e267ffeb5a95a5c27e0df4..232b762737c6d3818638bba016e3bf4e7d0b7fd8 100644 (file)
--- a/wxPython/src/_functions.i
+++ b/wxPython/src/_functions.i
@@ -52,7 +52,8 @@ MustHaveApp(wxEndBusyCursor);
 void wxEndBusyCursor();
 
 long wxGetElapsedTime(bool resetTimer = true);
-
+%pythoncode { GetElapsedTime = wx._deprecated(GetElapsedTime) }
+    
 bool wxIsBusy();
 wxString wxNow();
 bool wxShell(const wxString& command = wxPyEmptyString);

diff --git a/wxPython/src/_gauge.i b/wxPython/src/_gauge.i
index 97759d64b0d454c425bff710d0096aeb23a5d3cc..942a1bc04e0d60632d33ac578aa10a75460a2207 100644 (file)
--- a/wxPython/src/_gauge.i
+++ b/wxPython/src/_gauge.i
@@ -23,8 +23,8 @@ enum {
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
     wxGA_SMOOTH,
-    wxGA_PROGRESSBAR   // obsolete
 };
+%pythoncode { GA_PROGRESSBAR = 0 %# obsolete }
 
 //---------------------------------------------------------------------------
 

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index cf45734fb4635a0768ede06020aa2126fc1d7b4d..d8f320f29b34baa21102f09b50f6e83ae7c7b82c 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -558,9 +558,11 @@ public:
 
     // get the horizontal and vertical components of the item spacing
     wxSize GetItemSpacing() const;
+    %pythoncode { GetItemSpacing = wx._deprecated(GetItemSpacing) }
 
 #ifndef __WXMSW__
     void SetItemSpacing( int spacing, bool isSmall = false );
+    %pythoncode { SetItemSpacing = wx._deprecated(SetItemSpacing) }
 #endif
 
     // Gets the number of selected items in the list control

diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index b87ca2a0ab36a3767df73cfbd36aa1f3adb78f5e..8b557960b5ebfd7a8fea641c52082f648ba6158c 100644 (file)
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -27,7 +27,8 @@ enum {
     wxBK_BOTTOM,
     wxBK_LEFT,
     wxBK_RIGHT,
-    wxBK_ALIGN_MASK
+    wxBK_ALIGN_MASK,
+    wxBK_BUTTONBAR
 };
 
 
@@ -106,10 +107,17 @@ public:
     // returns true if we have wxCHB_TOP or wxCHB_BOTTOM style
     bool IsVertical() const;
 
+    // Sets/gets the margin around the controller
+    void SetControlMargin(int margin);
+    int GetControlMargin() const;
+
     // set/get option to shrink to fit current page
     void SetFitToCurrentPage(bool fit);
     bool GetFitToCurrentPage() const;
 
+    // returns the sizer containing the control, if any
+    wxSizer* GetControlSizer() const;
+
 
     // remove one page from the control and delete it
     virtual bool DeletePage(size_t n);

diff --git a/wxPython/src/_textctrl.i b/wxPython/src/_textctrl.i
index c8a805833925a4035f744c972e2f524ed0c322ba..fa9885c8072ed60e78999e4aa3380b72a7e2f41f 100644 (file)
--- a/wxPython/src/_textctrl.i
+++ b/wxPython/src/_textctrl.i
@@ -61,9 +61,6 @@ enum {
     wxTE_WORDWRAP,
     wxTE_BESTWRAP,
 
-    // obsolete synonym
-    wxTE_LINEWRAP,
-
     // force using RichEdit version 2.0 or 3.0 instead of 1.0 (default) for
     // wxTE_RICH controls - can be used together with or instead of wxTE_RICH
     wxTE_RICH2,
@@ -71,6 +68,9 @@ enum {
     wxTE_CAPITALIZE,
 };
 
+%pythoncode { TE_LINEWRAP = TE_CHARWRAP }
+
+
 
 enum wxTextAttrAlignment
 {

diff --git a/wxPython/src/_treectrl.i b/wxPython/src/_treectrl.i
index d3f855b0d14a4a57db8a6641759e62539f9a3036..bb17aca72d2c4192d8a2d247eed0454608814faf 100644 (file)
--- a/wxPython/src/_treectrl.i
+++ b/wxPython/src/_treectrl.i
@@ -46,10 +46,13 @@ enum {
     wxTR_DEFAULT_STYLE,
 
     wxTR_TWIST_BUTTONS,
-    wxTR_MAC_BUTTONS,
-    wxTR_AQUA_BUTTONS,
 };
 
+%pythoncode {
+    %# obsolete
+    TR_MAC_BUTTONS = 0
+    wxTR_AQUA_BUTTONS = 0
+}
 
 enum wxTreeItemIcon
 {

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index 1587864f41bc41114e7f5cf94a54249983dfb062..64af482caf4a32fd18f6e3ccead49d7134ed8668 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -55,7 +55,6 @@ wxGaugeNameStr = wx._controls.GaugeNameStr
 wxGA_HORIZONTAL = wx._controls.GA_HORIZONTAL
 wxGA_VERTICAL = wx._controls.GA_VERTICAL
 wxGA_SMOOTH = wx._controls.GA_SMOOTH
-wxGA_PROGRESSBAR = wx._controls.GA_PROGRESSBAR
 wxGauge = wx._controls.Gauge
 wxPreGauge = wx._controls.PreGauge
 wxGauge_GetClassDefaultAttributes = wx._controls.Gauge_GetClassDefaultAttributes
@@ -100,7 +99,6 @@ wxTE_DONTWRAP = wx._controls.TE_DONTWRAP
 wxTE_CHARWRAP = wx._controls.TE_CHARWRAP
 wxTE_WORDWRAP = wx._controls.TE_WORDWRAP
 wxTE_BESTWRAP = wx._controls.TE_BESTWRAP
-wxTE_LINEWRAP = wx._controls.TE_LINEWRAP
 wxTE_RICH2 = wx._controls.TE_RICH2
 wxTE_CAPITALIZE = wx._controls.TE_CAPITALIZE
 wxTEXT_ALIGNMENT_DEFAULT = wx._controls.TEXT_ALIGNMENT_DEFAULT
@@ -192,6 +190,7 @@ wxBK_BOTTOM = wx._controls.BK_BOTTOM
 wxBK_LEFT = wx._controls.BK_LEFT
 wxBK_RIGHT = wx._controls.BK_RIGHT
 wxBK_ALIGN_MASK = wx._controls.BK_ALIGN_MASK
+wxBK_BUTTONBAR = wx._controls.BK_BUTTONBAR
 wxBookCtrlBase = wx._controls.BookCtrlBase
 wxBookCtrlBase_GetClassDefaultAttributes = wx._controls.BookCtrlBase_GetClassDefaultAttributes
 wxBookCtrlBaseEvent = wx._controls.BookCtrlBaseEvent
@@ -378,8 +377,6 @@ wxTR_ROW_LINES = wx._controls.TR_ROW_LINES
 wxTR_FULL_ROW_HIGHLIGHT = wx._controls.TR_FULL_ROW_HIGHLIGHT
 wxTR_DEFAULT_STYLE = wx._controls.TR_DEFAULT_STYLE
 wxTR_TWIST_BUTTONS = wx._controls.TR_TWIST_BUTTONS
-wxTR_MAC_BUTTONS = wx._controls.TR_MAC_BUTTONS
-wxTR_AQUA_BUTTONS = wx._controls.TR_AQUA_BUTTONS
 wxTreeItemIcon_Normal = wx._controls.TreeItemIcon_Normal
 wxTreeItemIcon_Selected = wx._controls.TreeItemIcon_Selected
 wxTreeItemIcon_Expanded = wx._controls.TreeItemIcon_Expanded

diff --git a/wxPython/wxPython/_misc.py b/wxPython/wxPython/_misc.py
index b4be23ede6df515c81cf0ca32fd786dce40d1aa5..9ec340eb089a5e1fac22d76c37707d4127d96db0 100644 (file)
--- a/wxPython/wxPython/_misc.py
+++ b/wxPython/wxPython/_misc.py
@@ -471,6 +471,8 @@ wxDateTimeFromDMY = wx._misc.DateTimeFromDMY
 wxDateTimeFromDateTime = wx._misc.DateTimeFromDateTime
 wxDateTime_SetToWeekOfYear = wx._misc.DateTime_SetToWeekOfYear
 wxTimeSpan = wx._misc.TimeSpan
+wxTimeSpan_Milliseconds = wx._misc.TimeSpan_Milliseconds
+wxTimeSpan_Millisecond = wx._misc.TimeSpan_Millisecond
 wxTimeSpan_Seconds = wx._misc.TimeSpan_Seconds
 wxTimeSpan_Second = wx._misc.TimeSpan_Second
 wxTimeSpan_Minutes = wx._misc.TimeSpan_Minutes