merge #4 from 2.6 branch

[wxWidgets.git] / wxPython / src / __controls_rename.i

diff --git a/wxPython/src/__controls_rename.i b/wxPython/src/__controls_rename.i
index 65412dca591ab194bc49740dfbfb840e78bbe58b..45cbb2f0f037127030bad9e0a9f702a4e5fff710 100644 (file)
--- a/wxPython/src/__controls_rename.i
+++ b/wxPython/src/__controls_rename.i
@@ -47,8 +47,10 @@
 %rename(TE_AUTO_URL)                        wxTE_AUTO_URL;
 %rename(TE_NOHIDESEL)                       wxTE_NOHIDESEL;
 %rename(TE_DONTWRAP)                        wxTE_DONTWRAP;
-%rename(TE_LINEWRAP)                        wxTE_LINEWRAP;
+%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;
@@ -91,6 +93,7 @@
 %rename(RadioButton)                        wxRadioButton;
 %rename(SL_HORIZONTAL)                      wxSL_HORIZONTAL;
 %rename(SL_VERTICAL)                        wxSL_VERTICAL;
+%rename(SL_TICKS)                           wxSL_TICKS;
 %rename(SL_AUTOTICKS)                       wxSL_AUTOTICKS;
 %rename(SL_LABELS)                          wxSL_LABELS;
 %rename(SL_LEFT)                            wxSL_LEFT;
@@ -133,8 +136,6 @@
 %rename(CHB_ALIGN_MASK)                     wxCHB_ALIGN_MASK;
 %rename(Choicebook)                         wxChoicebook;
 %rename(ChoicebookEvent)                    wxChoicebookEvent;
-%rename(BookCtrlSizer)                      wxBookCtrlSizer;
-%rename(NotebookSizer)                      wxNotebookSizer;
 %rename(TOOL_STYLE_BUTTON)                  wxTOOL_STYLE_BUTTON;
 %rename(TOOL_STYLE_SEPARATOR)               wxTOOL_STYLE_SEPARATOR;
 %rename(TOOL_STYLE_CONTROL)                 wxTOOL_STYLE_CONTROL;