wxSL_* labels moved to a different module

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

diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i
index 838721a6b84ec7a35c73cc70bd55bd2908668585..d9533c4953792fbb41857f877580ec242ae8ac4f 100644 (file)
--- a/wxPython/src/__controls_rename.i
+++ b/wxPython/src/__controls_rename.i
@@ -88,6 +88,17 @@
 %rename(SpinEvent)                          wxSpinEvent;
 %rename(RadioBox)                           wxRadioBox;
 %rename(RadioButton)                        wxRadioButton;
 %rename(SpinEvent)                          wxSpinEvent;
 %rename(RadioBox)                           wxRadioBox;
 %rename(RadioButton)                        wxRadioButton;

+%rename(SL_HORIZONTAL)                      wxSL_HORIZONTAL;
+%rename(SL_VERTICAL)                        wxSL_VERTICAL;
+%rename(SL_AUTOTICKS)                       wxSL_AUTOTICKS;
+%rename(SL_LABELS)                          wxSL_LABELS;
+%rename(SL_LEFT)                            wxSL_LEFT;
+%rename(SL_TOP)                             wxSL_TOP;
+%rename(SL_RIGHT)                           wxSL_RIGHT;
+%rename(SL_BOTTOM)                          wxSL_BOTTOM;
+%rename(SL_BOTH)                            wxSL_BOTH;
+%rename(SL_SELRANGE)                        wxSL_SELRANGE;
+%rename(SL_INVERSE)                         wxSL_INVERSE;

 %rename(Slider)                             wxSlider;
 %rename(ToggleButton)                       wxToggleButton;
 %rename(BookCtrlBase)                       wxBookCtrlBase;
 %rename(Slider)                             wxSlider;
 %rename(ToggleButton)                       wxToggleButton;
 %rename(BookCtrlBase)                       wxBookCtrlBase;

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index b742020bd7947a56b816507754d935170719419a..9f17758594c35658a60f57bf33e0b64e805c02b3 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -53,16 +53,6 @@
 %rename(RA_SPECIFY_COLS)                    wxRA_SPECIFY_COLS;
 %rename(RB_GROUP)                           wxRB_GROUP;
 %rename(RB_SINGLE)                          wxRB_SINGLE;
 %rename(RA_SPECIFY_COLS)                    wxRA_SPECIFY_COLS;
 %rename(RB_GROUP)                           wxRB_GROUP;
 %rename(RB_SINGLE)                          wxRB_SINGLE;

-%rename(SL_HORIZONTAL)                      wxSL_HORIZONTAL;
-%rename(SL_VERTICAL)                        wxSL_VERTICAL;
-%rename(SL_AUTOTICKS)                       wxSL_AUTOTICKS;
-%rename(SL_LABELS)                          wxSL_LABELS;
-%rename(SL_LEFT)                            wxSL_LEFT;
-%rename(SL_TOP)                             wxSL_TOP;
-%rename(SL_RIGHT)                           wxSL_RIGHT;
-%rename(SL_BOTTOM)                          wxSL_BOTTOM;
-%rename(SL_BOTH)                            wxSL_BOTH;
-%rename(SL_SELRANGE)                        wxSL_SELRANGE;

 %rename(SB_HORIZONTAL)                      wxSB_HORIZONTAL;
 %rename(SB_VERTICAL)                        wxSB_VERTICAL;
 %rename(ST_SIZEGRIP)                        wxST_SIZEGRIP;
 %rename(SB_HORIZONTAL)                      wxSB_HORIZONTAL;
 %rename(SB_VERTICAL)                        wxSB_VERTICAL;
 %rename(ST_SIZEGRIP)                        wxST_SIZEGRIP;

diff --git a/wxPython/wxPython/_controls.py b/wxPython/wxPython/_controls.py
index f7bbff85083ca942208fb05a71a7565ed75f5c4f..ddffa027cbd3b7dd56631d5ba4646449da095a46 100644 (file)
--- a/wxPython/wxPython/_controls.py
+++ b/wxPython/wxPython/_controls.py
@@ -183,6 +183,17 @@ wxRadioButtonPtr = wx._controls.RadioButtonPtr
 wxPreRadioButton = wx._controls.PreRadioButton
 wxRadioButton_GetClassDefaultAttributes = wx._controls.RadioButton_GetClassDefaultAttributes
 wxSliderNameStr = wx._controls.SliderNameStr
 wxPreRadioButton = wx._controls.PreRadioButton
 wxRadioButton_GetClassDefaultAttributes = wx._controls.RadioButton_GetClassDefaultAttributes
 wxSliderNameStr = wx._controls.SliderNameStr

+wxSL_HORIZONTAL = wx._controls.SL_HORIZONTAL
+wxSL_VERTICAL = wx._controls.SL_VERTICAL
+wxSL_AUTOTICKS = wx._controls.SL_AUTOTICKS
+wxSL_LABELS = wx._controls.SL_LABELS
+wxSL_LEFT = wx._controls.SL_LEFT
+wxSL_TOP = wx._controls.SL_TOP
+wxSL_RIGHT = wx._controls.SL_RIGHT
+wxSL_BOTTOM = wx._controls.SL_BOTTOM
+wxSL_BOTH = wx._controls.SL_BOTH
+wxSL_SELRANGE = wx._controls.SL_SELRANGE
+wxSL_INVERSE = wx._controls.SL_INVERSE

 wxSlider = wx._controls.Slider
 wxSliderPtr = wx._controls.SliderPtr
 wxPreSlider = wx._controls.PreSlider
 wxSlider = wx._controls.Slider
 wxSliderPtr = wx._controls.SliderPtr
 wxPreSlider = wx._controls.PreSlider

diff --git a/wxPython/wxPython/_core.py b/wxPython/wxPython/_core.py
index 6c4acc335690541879a268394d0fba231ede7721..8fc09eca106d04281edc444183a7bc19d38fcb5f 100644 (file)
--- a/wxPython/wxPython/_core.py
+++ b/wxPython/wxPython/_core.py
@@ -69,16 +69,6 @@ wxRA_SPECIFY_ROWS = wx._core.RA_SPECIFY_ROWS
 wxRA_SPECIFY_COLS = wx._core.RA_SPECIFY_COLS
 wxRB_GROUP = wx._core.RB_GROUP
 wxRB_SINGLE = wx._core.RB_SINGLE
 wxRA_SPECIFY_COLS = wx._core.RA_SPECIFY_COLS
 wxRB_GROUP = wx._core.RB_GROUP
 wxRB_SINGLE = wx._core.RB_SINGLE

-wxSL_HORIZONTAL = wx._core.SL_HORIZONTAL
-wxSL_VERTICAL = wx._core.SL_VERTICAL
-wxSL_AUTOTICKS = wx._core.SL_AUTOTICKS
-wxSL_LABELS = wx._core.SL_LABELS
-wxSL_LEFT = wx._core.SL_LEFT
-wxSL_TOP = wx._core.SL_TOP
-wxSL_RIGHT = wx._core.SL_RIGHT
-wxSL_BOTTOM = wx._core.SL_BOTTOM
-wxSL_BOTH = wx._core.SL_BOTH
-wxSL_SELRANGE = wx._core.SL_SELRANGE

 wxSB_HORIZONTAL = wx._core.SB_HORIZONTAL
 wxSB_VERTICAL = wx._core.SB_VERTICAL
 wxST_SIZEGRIP = wx._core.ST_SIZEGRIP
 wxSB_HORIZONTAL = wx._core.SB_HORIZONTAL
 wxSB_VERTICAL = wx._core.SB_VERTICAL
 wxST_SIZEGRIP = wx._core.ST_SIZEGRIP