%rename(BU_TOP) wxBU_TOP;
%rename(BU_RIGHT) wxBU_RIGHT;
%rename(BU_BOTTOM) wxBU_BOTTOM;
+%rename(BU_ALIGN_MASK) wxBU_ALIGN_MASK;
%rename(BU_EXACTFIT) wxBU_EXACTFIT;
%rename(BU_AUTODRAW) wxBU_AUTODRAW;
%rename(Button) wxButton;
%rename(TE_HT_ON_TEXT) wxTE_HT_ON_TEXT;
%rename(TE_HT_BELOW) wxTE_HT_BELOW;
%rename(TE_HT_BEYOND) wxTE_HT_BEYOND;
+%rename(OutOfRangeTextCoord) wxOutOfRangeTextCoord;
+%rename(InvalidTextCoord) wxInvalidTextCoord;
%rename(TextAttr) wxTextAttr;
%rename(TextCtrl) wxTextCtrl;
%rename(TextUrlEvent) wxTextUrlEvent;
%rename(RadioButton) wxRadioButton;
%rename(Slider) wxSlider;
%rename(ToggleButton) wxToggleButton;
-%rename(BookCtrl) wxBookCtrl;
-%rename(BookCtrlEvent) wxBookCtrlEvent;
+%rename(BookCtrlBase) wxBookCtrlBase;
+%rename(BookCtrlBaseEvent) wxBookCtrlBaseEvent;
%rename(NB_FIXEDWIDTH) wxNB_FIXEDWIDTH;
%rename(NB_TOP) wxNB_TOP;
%rename(NB_LEFT) wxNB_LEFT;
%rename(LB_ALIGN_MASK) wxLB_ALIGN_MASK;
%rename(Listbook) wxListbook;
%rename(ListbookEvent) wxListbookEvent;
+%rename(CHB_DEFAULT) wxCHB_DEFAULT;
+%rename(CHB_TOP) wxCHB_TOP;
+%rename(CHB_BOTTOM) wxCHB_BOTTOM;
+%rename(CHB_LEFT) wxCHB_LEFT;
+%rename(CHB_RIGHT) wxCHB_RIGHT;
+%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;