Minor tweaks to bring up to date with CVS changes

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

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index a973839120eae96f6e74700deaf103b19592d35a..8354b55786d6b023faff6690170368da9d2f023f 100644 (file)
--- a/wxPython/src/__core_rename.i
+++ b/wxPython/src/__core_rename.i
@@ -15,17 +15,14 @@
 %rename(STATIC_BORDER)                      wxSTATIC_BORDER;
 %rename(TRANSPARENT_WINDOW)                 wxTRANSPARENT_WINDOW;
 %rename(NO_BORDER)                          wxNO_BORDER;
 %rename(STATIC_BORDER)                      wxSTATIC_BORDER;
 %rename(TRANSPARENT_WINDOW)                 wxTRANSPARENT_WINDOW;
 %rename(NO_BORDER)                          wxNO_BORDER;

+%rename(DEFAULT_CONTROL_BORDER)             wxDEFAULT_CONTROL_BORDER;
+%rename(DEFAULT_STATUSBAR_STYLE)            wxDEFAULT_STATUSBAR_STYLE;

 %rename(TAB_TRAVERSAL)                      wxTAB_TRAVERSAL;
 %rename(WANTS_CHARS)                        wxWANTS_CHARS;
 %rename(POPUP_WINDOW)                       wxPOPUP_WINDOW;
 %rename(CENTER_FRAME)                       wxCENTER_FRAME;
 %rename(CENTRE_ON_SCREEN)                   wxCENTRE_ON_SCREEN;
 %rename(CENTER_ON_SCREEN)                   wxCENTER_ON_SCREEN;
 %rename(TAB_TRAVERSAL)                      wxTAB_TRAVERSAL;
 %rename(WANTS_CHARS)                        wxWANTS_CHARS;
 %rename(POPUP_WINDOW)                       wxPOPUP_WINDOW;
 %rename(CENTER_FRAME)                       wxCENTER_FRAME;
 %rename(CENTRE_ON_SCREEN)                   wxCENTRE_ON_SCREEN;
 %rename(CENTER_ON_SCREEN)                   wxCENTER_ON_SCREEN;

-%rename(ED_CLIENT_MARGIN)                   wxED_CLIENT_MARGIN;
-%rename(ED_BUTTONS_BOTTOM)                  wxED_BUTTONS_BOTTOM;
-%rename(ED_BUTTONS_RIGHT)                   wxED_BUTTONS_RIGHT;
-%rename(ED_STATIC_LINE)                     wxED_STATIC_LINE;
-%rename(EXT_DIALOG_STYLE)                   wxEXT_DIALOG_STYLE;

 %rename(CLIP_CHILDREN)                      wxCLIP_CHILDREN;
 %rename(CLIP_SIBLINGS)                      wxCLIP_SIBLINGS;
 %rename(ALWAYS_SHOW_SB)                     wxALWAYS_SHOW_SB;
 %rename(CLIP_CHILDREN)                      wxCLIP_CHILDREN;
 %rename(CLIP_SIBLINGS)                      wxCLIP_SIBLINGS;
 %rename(ALWAYS_SHOW_SB)                     wxALWAYS_SHOW_SB;


@@ -51,20 +48,12 @@
 %rename(RA_VERTICAL)                        wxRA_VERTICAL;
 %rename(RA_SPECIFY_ROWS)                    wxRA_SPECIFY_ROWS;
 %rename(RA_SPECIFY_COLS)                    wxRA_SPECIFY_COLS;
 %rename(RA_VERTICAL)                        wxRA_VERTICAL;
 %rename(RA_SPECIFY_ROWS)                    wxRA_SPECIFY_ROWS;
 %rename(RA_SPECIFY_COLS)                    wxRA_SPECIFY_COLS;

+%rename(RA_USE_CHECKBOX)                    wxRA_USE_CHECKBOX;

 %rename(RB_GROUP)                           wxRB_GROUP;
 %rename(RB_SINGLE)                          wxRB_SINGLE;
 %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(SB_HORIZONTAL)                      wxSB_HORIZONTAL;
 %rename(SB_VERTICAL)                        wxSB_VERTICAL;

+%rename(RB_USE_CHECKBOX)                    wxRB_USE_CHECKBOX;

 %rename(ST_SIZEGRIP)                        wxST_SIZEGRIP;
 %rename(ST_NO_AUTORESIZE)                   wxST_NO_AUTORESIZE;
 %rename(FLOOD_SURFACE)                      wxFLOOD_SURFACE;
 %rename(ST_SIZEGRIP)                        wxST_SIZEGRIP;
 %rename(ST_NO_AUTORESIZE)                   wxST_NO_AUTORESIZE;
 %rename(FLOOD_SURFACE)                      wxFLOOD_SURFACE;


@@ -102,6 +91,7 @@
 %rename(SIZE_AUTO)                          wxSIZE_AUTO;
 %rename(SIZE_USE_EXISTING)                  wxSIZE_USE_EXISTING;
 %rename(SIZE_ALLOW_MINUS_ONE)               wxSIZE_ALLOW_MINUS_ONE;
 %rename(SIZE_AUTO)                          wxSIZE_AUTO;
 %rename(SIZE_USE_EXISTING)                  wxSIZE_USE_EXISTING;
 %rename(SIZE_ALLOW_MINUS_ONE)               wxSIZE_ALLOW_MINUS_ONE;

+%rename(SIZE_FORCE)                         wxSIZE_FORCE;

 %rename(PORTRAIT)                           wxPORTRAIT;
 %rename(LANDSCAPE)                          wxLANDSCAPE;
 %rename(PRINT_QUALITY_HIGH)                 wxPRINT_QUALITY_HIGH;
 %rename(PORTRAIT)                           wxPORTRAIT;
 %rename(LANDSCAPE)                          wxLANDSCAPE;
 %rename(PRINT_QUALITY_HIGH)                 wxPRINT_QUALITY_HIGH;


@@ -110,6 +100,7 @@
 %rename(PRINT_QUALITY_DRAFT)                wxPRINT_QUALITY_DRAFT;
 %rename(ID_ANY)                             wxID_ANY;
 %rename(ID_SEPARATOR)                       wxID_SEPARATOR;
 %rename(PRINT_QUALITY_DRAFT)                wxPRINT_QUALITY_DRAFT;
 %rename(ID_ANY)                             wxID_ANY;
 %rename(ID_SEPARATOR)                       wxID_SEPARATOR;

+%rename(ID_NONE)                            wxID_NONE;

 %rename(ID_LOWEST)                          wxID_LOWEST;
 %rename(ID_OPEN)                            wxID_OPEN;
 %rename(ID_CLOSE)                           wxID_CLOSE;
 %rename(ID_LOWEST)                          wxID_LOWEST;
 %rename(ID_OPEN)                            wxID_OPEN;
 %rename(ID_CLOSE)                           wxID_CLOSE;


@@ -177,6 +168,29 @@
 %rename(ID_ABORT)                           wxID_ABORT;
 %rename(ID_RETRY)                           wxID_RETRY;
 %rename(ID_IGNORE)                          wxID_IGNORE;
 %rename(ID_ABORT)                           wxID_ABORT;
 %rename(ID_RETRY)                           wxID_RETRY;
 %rename(ID_IGNORE)                          wxID_IGNORE;

+%rename(ID_ADD)                             wxID_ADD;
+%rename(ID_REMOVE)                          wxID_REMOVE;
+%rename(ID_UP)                              wxID_UP;
+%rename(ID_DOWN)                            wxID_DOWN;
+%rename(ID_HOME)                            wxID_HOME;
+%rename(ID_REFRESH)                         wxID_REFRESH;
+%rename(ID_STOP)                            wxID_STOP;
+%rename(ID_INDEX)                           wxID_INDEX;
+%rename(ID_BOLD)                            wxID_BOLD;
+%rename(ID_ITALIC)                          wxID_ITALIC;
+%rename(ID_JUSTIFY_CENTER)                  wxID_JUSTIFY_CENTER;
+%rename(ID_JUSTIFY_FILL)                    wxID_JUSTIFY_FILL;
+%rename(ID_JUSTIFY_RIGHT)                   wxID_JUSTIFY_RIGHT;
+%rename(ID_JUSTIFY_LEFT)                    wxID_JUSTIFY_LEFT;
+%rename(ID_UNDERLINE)                       wxID_UNDERLINE;
+%rename(ID_INDENT)                          wxID_INDENT;
+%rename(ID_UNINDENT)                        wxID_UNINDENT;
+%rename(ID_ZOOM_100)                        wxID_ZOOM_100;
+%rename(ID_ZOOM_FIT)                        wxID_ZOOM_FIT;
+%rename(ID_ZOOM_IN)                         wxID_ZOOM_IN;
+%rename(ID_ZOOM_OUT)                        wxID_ZOOM_OUT;
+%rename(ID_UNDELETE)                        wxID_UNDELETE;
+%rename(ID_REVERT_TO_SAVED)                 wxID_REVERT_TO_SAVED;

 %rename(ID_HIGHEST)                         wxID_HIGHEST;
 %rename(OPEN)                               wxOPEN;
 %rename(SAVE)                               wxSAVE;
 %rename(ID_HIGHEST)                         wxID_HIGHEST;
 %rename(OPEN)                               wxOPEN;
 %rename(SAVE)                               wxSAVE;


@@ -195,6 +209,8 @@
 %rename(PD_ELAPSED_TIME)                    wxPD_ELAPSED_TIME;
 %rename(PD_ESTIMATED_TIME)                  wxPD_ESTIMATED_TIME;
 %rename(PD_REMAINING_TIME)                  wxPD_REMAINING_TIME;
 %rename(PD_ELAPSED_TIME)                    wxPD_ELAPSED_TIME;
 %rename(PD_ESTIMATED_TIME)                  wxPD_ESTIMATED_TIME;
 %rename(PD_REMAINING_TIME)                  wxPD_REMAINING_TIME;

+%rename(PD_SMOOTH)                          wxPD_SMOOTH;
+%rename(PD_CAN_SKIP)                        wxPD_CAN_SKIP;

 %rename(DD_NEW_DIR_BUTTON)                  wxDD_NEW_DIR_BUTTON;
 %rename(DD_DEFAULT_STYLE)                   wxDD_DEFAULT_STYLE;
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;
 %rename(DD_NEW_DIR_BUTTON)                  wxDD_NEW_DIR_BUTTON;
 %rename(DD_DEFAULT_STYLE)                   wxDD_DEFAULT_STYLE;
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;


@@ -263,6 +279,9 @@
 %rename(BORDER_SUNKEN)                      wxBORDER_SUNKEN;
 %rename(BORDER_DOUBLE)                      wxBORDER_DOUBLE;
 %rename(BORDER_MASK)                        wxBORDER_MASK;
 %rename(BORDER_SUNKEN)                      wxBORDER_SUNKEN;
 %rename(BORDER_DOUBLE)                      wxBORDER_DOUBLE;
 %rename(BORDER_MASK)                        wxBORDER_MASK;

+%rename(BG_STYLE_SYSTEM)                    wxBG_STYLE_SYSTEM;
+%rename(BG_STYLE_COLOUR)                    wxBG_STYLE_COLOUR;
+%rename(BG_STYLE_CUSTOM)                    wxBG_STYLE_CUSTOM;

 %rename(DEFAULT)                            wxDEFAULT;
 %rename(DECORATIVE)                         wxDECORATIVE;
 %rename(ROMAN)                              wxROMAN;
 %rename(DEFAULT)                            wxDEFAULT;
 %rename(DECORATIVE)                         wxDECORATIVE;
 %rename(ROMAN)                              wxROMAN;


@@ -285,6 +304,8 @@
 %rename(USER_DASH)                          wxUSER_DASH;
 %rename(TRANSPARENT)                        wxTRANSPARENT;
 %rename(STIPPLE)                            wxSTIPPLE;
 %rename(USER_DASH)                          wxUSER_DASH;
 %rename(TRANSPARENT)                        wxTRANSPARENT;
 %rename(STIPPLE)                            wxSTIPPLE;

+%rename(STIPPLE_MASK)                       wxSTIPPLE_MASK;
+%rename(STIPPLE_MASK_OPAQUE)                wxSTIPPLE_MASK_OPAQUE;

 %rename(BDIAGONAL_HATCH)                    wxBDIAGONAL_HATCH;
 %rename(CROSSDIAG_HATCH)                    wxCROSSDIAG_HATCH;
 %rename(FDIAGONAL_HATCH)                    wxFDIAGONAL_HATCH;
 %rename(BDIAGONAL_HATCH)                    wxBDIAGONAL_HATCH;
 %rename(CROSSDIAG_HATCH)                    wxCROSSDIAG_HATCH;
 %rename(FDIAGONAL_HATCH)                    wxFDIAGONAL_HATCH;


@@ -380,6 +401,56 @@
 %rename(PAPER_A2)                           wxPAPER_A2;
 %rename(PAPER_A3_TRANSVERSE)                wxPAPER_A3_TRANSVERSE;
 %rename(PAPER_A3_EXTRA_TRANSVERSE)          wxPAPER_A3_EXTRA_TRANSVERSE;
 %rename(PAPER_A2)                           wxPAPER_A2;
 %rename(PAPER_A3_TRANSVERSE)                wxPAPER_A3_TRANSVERSE;
 %rename(PAPER_A3_EXTRA_TRANSVERSE)          wxPAPER_A3_EXTRA_TRANSVERSE;

+%rename(PAPER_DBL_JAPANESE_POSTCARD)        wxPAPER_DBL_JAPANESE_POSTCARD;
+%rename(PAPER_A6)                           wxPAPER_A6;
+%rename(PAPER_JENV_KAKU2)                   wxPAPER_JENV_KAKU2;
+%rename(PAPER_JENV_KAKU3)                   wxPAPER_JENV_KAKU3;
+%rename(PAPER_JENV_CHOU3)                   wxPAPER_JENV_CHOU3;
+%rename(PAPER_JENV_CHOU4)                   wxPAPER_JENV_CHOU4;
+%rename(PAPER_LETTER_ROTATED)               wxPAPER_LETTER_ROTATED;
+%rename(PAPER_A3_ROTATED)                   wxPAPER_A3_ROTATED;
+%rename(PAPER_A4_ROTATED)                   wxPAPER_A4_ROTATED;
+%rename(PAPER_A5_ROTATED)                   wxPAPER_A5_ROTATED;
+%rename(PAPER_B4_JIS_ROTATED)               wxPAPER_B4_JIS_ROTATED;
+%rename(PAPER_B5_JIS_ROTATED)               wxPAPER_B5_JIS_ROTATED;
+%rename(PAPER_JAPANESE_POSTCARD_ROTATED)    wxPAPER_JAPANESE_POSTCARD_ROTATED;
+%rename(PAPER_DBL_JAPANESE_POSTCARD_ROTATED)  wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED;
+%rename(PAPER_A6_ROTATED)                   wxPAPER_A6_ROTATED;
+%rename(PAPER_JENV_KAKU2_ROTATED)           wxPAPER_JENV_KAKU2_ROTATED;
+%rename(PAPER_JENV_KAKU3_ROTATED)           wxPAPER_JENV_KAKU3_ROTATED;
+%rename(PAPER_JENV_CHOU3_ROTATED)           wxPAPER_JENV_CHOU3_ROTATED;
+%rename(PAPER_JENV_CHOU4_ROTATED)           wxPAPER_JENV_CHOU4_ROTATED;
+%rename(PAPER_B6_JIS)                       wxPAPER_B6_JIS;
+%rename(PAPER_B6_JIS_ROTATED)               wxPAPER_B6_JIS_ROTATED;
+%rename(PAPER_12X11)                        wxPAPER_12X11;
+%rename(PAPER_JENV_YOU4)                    wxPAPER_JENV_YOU4;
+%rename(PAPER_JENV_YOU4_ROTATED)            wxPAPER_JENV_YOU4_ROTATED;
+%rename(PAPER_P16K)                         wxPAPER_P16K;
+%rename(PAPER_P32K)                         wxPAPER_P32K;
+%rename(PAPER_P32KBIG)                      wxPAPER_P32KBIG;
+%rename(PAPER_PENV_1)                       wxPAPER_PENV_1;
+%rename(PAPER_PENV_2)                       wxPAPER_PENV_2;
+%rename(PAPER_PENV_3)                       wxPAPER_PENV_3;
+%rename(PAPER_PENV_4)                       wxPAPER_PENV_4;
+%rename(PAPER_PENV_5)                       wxPAPER_PENV_5;
+%rename(PAPER_PENV_6)                       wxPAPER_PENV_6;
+%rename(PAPER_PENV_7)                       wxPAPER_PENV_7;
+%rename(PAPER_PENV_8)                       wxPAPER_PENV_8;
+%rename(PAPER_PENV_9)                       wxPAPER_PENV_9;
+%rename(PAPER_PENV_10)                      wxPAPER_PENV_10;
+%rename(PAPER_P16K_ROTATED)                 wxPAPER_P16K_ROTATED;
+%rename(PAPER_P32K_ROTATED)                 wxPAPER_P32K_ROTATED;
+%rename(PAPER_P32KBIG_ROTATED)              wxPAPER_P32KBIG_ROTATED;
+%rename(PAPER_PENV_1_ROTATED)               wxPAPER_PENV_1_ROTATED;
+%rename(PAPER_PENV_2_ROTATED)               wxPAPER_PENV_2_ROTATED;
+%rename(PAPER_PENV_3_ROTATED)               wxPAPER_PENV_3_ROTATED;
+%rename(PAPER_PENV_4_ROTATED)               wxPAPER_PENV_4_ROTATED;
+%rename(PAPER_PENV_5_ROTATED)               wxPAPER_PENV_5_ROTATED;
+%rename(PAPER_PENV_6_ROTATED)               wxPAPER_PENV_6_ROTATED;
+%rename(PAPER_PENV_7_ROTATED)               wxPAPER_PENV_7_ROTATED;
+%rename(PAPER_PENV_8_ROTATED)               wxPAPER_PENV_8_ROTATED;
+%rename(PAPER_PENV_9_ROTATED)               wxPAPER_PENV_9_ROTATED;
+%rename(PAPER_PENV_10_ROTATED)              wxPAPER_PENV_10_ROTATED;

 %rename(DUPLEX_SIMPLEX)                     wxDUPLEX_SIMPLEX;
 %rename(DUPLEX_HORIZONTAL)                  wxDUPLEX_HORIZONTAL;
 %rename(DUPLEX_VERTICAL)                    wxDUPLEX_VERTICAL;
 %rename(DUPLEX_SIMPLEX)                     wxDUPLEX_SIMPLEX;
 %rename(DUPLEX_HORIZONTAL)                  wxDUPLEX_HORIZONTAL;
 %rename(DUPLEX_VERTICAL)                    wxDUPLEX_VERTICAL;


@@ -407,8 +478,12 @@
 %rename(MOD_NONE)                           wxMOD_NONE;
 %rename(MOD_ALT)                            wxMOD_ALT;
 %rename(MOD_CONTROL)                        wxMOD_CONTROL;
 %rename(MOD_NONE)                           wxMOD_NONE;
 %rename(MOD_ALT)                            wxMOD_ALT;
 %rename(MOD_CONTROL)                        wxMOD_CONTROL;

+%rename(MOD_ALTGR)                          wxMOD_ALTGR;

 %rename(MOD_SHIFT)                          wxMOD_SHIFT;
 %rename(MOD_SHIFT)                          wxMOD_SHIFT;

+%rename(MOD_META)                           wxMOD_META;

 %rename(MOD_WIN)                            wxMOD_WIN;
 %rename(MOD_WIN)                            wxMOD_WIN;

+%rename(MOD_CMD)                            wxMOD_CMD;
+%rename(MOD_ALL)                            wxMOD_ALL;

 %rename(UPDATE_UI_NONE)                     wxUPDATE_UI_NONE;
 %rename(UPDATE_UI_RECURSE)                  wxUPDATE_UI_RECURSE;
 %rename(UPDATE_UI_FROMIDLE)                 wxUPDATE_UI_FROMIDLE;
 %rename(UPDATE_UI_NONE)                     wxUPDATE_UI_NONE;
 %rename(UPDATE_UI_RECURSE)                  wxUPDATE_UI_RECURSE;
 %rename(UPDATE_UI_FROMIDLE)                 wxUPDATE_UI_FROMIDLE;


@@ -478,16 +553,24 @@
 %rename(OutputStream)                       wxOutputStream;
 %rename(FSFile)                             wxFSFile;
 %rename(FileSystem)                         wxFileSystem;
 %rename(OutputStream)                       wxOutputStream;
 %rename(FSFile)                             wxFSFile;
 %rename(FileSystem)                         wxFileSystem;

-%rename(FileSystem_URLToFileName)           wxFileSystem_URLToFileName;

 %rename(InternetFSHandler)                  wxInternetFSHandler;
 %rename(ZipFSHandler)                       wxZipFSHandler;
 %rename(MemoryFSHandler)                    wxMemoryFSHandler;
 %rename(InternetFSHandler)                  wxInternetFSHandler;
 %rename(ZipFSHandler)                       wxZipFSHandler;
 %rename(MemoryFSHandler)                    wxMemoryFSHandler;

+%rename(IMAGE_ALPHA_TRANSPARENT)            wxIMAGE_ALPHA_TRANSPARENT;
+%rename(IMAGE_ALPHA_THRESHOLD)              wxIMAGE_ALPHA_THRESHOLD;
+%rename(IMAGE_ALPHA_OPAQUE)                 wxIMAGE_ALPHA_OPAQUE;

 %rename(ImageHandler)                       wxImageHandler;
 %rename(ImageHandler)                       wxImageHandler;

+%rename(PyImageHandler)                     wxPyImageHandler;

 %rename(ImageHistogram)                     wxImageHistogram;
 %rename(ImageHistogram)                     wxImageHistogram;

+%rename(Image_RGBValue)                     wxImage_RGBValue;
+%rename(Image_HSVValue)                     wxImage_HSVValue;

 %rename(Image)                              wxImage;
 %rename(NullImage)                          wxNullImage;
 %rename(IMAGE_RESOLUTION_INCHES)            wxIMAGE_RESOLUTION_INCHES;
 %rename(IMAGE_RESOLUTION_CM)                wxIMAGE_RESOLUTION_CM;
 %rename(Image)                              wxImage;
 %rename(NullImage)                          wxNullImage;
 %rename(IMAGE_RESOLUTION_INCHES)            wxIMAGE_RESOLUTION_INCHES;
 %rename(IMAGE_RESOLUTION_CM)                wxIMAGE_RESOLUTION_CM;

+%rename(PNG_TYPE_COLOUR)                    wxPNG_TYPE_COLOUR;
+%rename(PNG_TYPE_GREY)                      wxPNG_TYPE_GREY;
+%rename(PNG_TYPE_GREY_RED)                  wxPNG_TYPE_GREY_RED;

 %rename(BMP_24BPP)                          wxBMP_24BPP;
 %rename(BMP_8BPP)                           wxBMP_8BPP;
 %rename(BMP_8BPP_GREY)                      wxBMP_8BPP_GREY;
 %rename(BMP_24BPP)                          wxBMP_24BPP;
 %rename(BMP_8BPP)                           wxBMP_8BPP;
 %rename(BMP_8BPP_GREY)                      wxBMP_8BPP_GREY;


@@ -562,6 +645,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;


@@ -576,6 +660,10 @@
 %rename(WakeUpIdle)                         wxWakeUpIdle;
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;
 %rename(WakeUpIdle)                         wxWakeUpIdle;
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;

+%rename(SetDefaultPyEncoding)               wxSetDefaultPyEncoding;
+%rename(GetDefaultPyEncoding)               wxGetDefaultPyEncoding;
+%rename(EventLoop)                          wxEventLoop;
+%rename(EventLoopActivator)                 wxEventLoopActivator;

 %rename(AcceleratorEntry)                   wxAcceleratorEntry;
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;
 %rename(AcceleratorEntry)                   wxAcceleratorEntry;
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;


@@ -610,6 +698,7 @@
 %rename(FLEX_GROWMODE_SPECIFIED)            wxFLEX_GROWMODE_SPECIFIED;
 %rename(FLEX_GROWMODE_ALL)                  wxFLEX_GROWMODE_ALL;
 %rename(FlexGridSizer)                      wxFlexGridSizer;
 %rename(FLEX_GROWMODE_SPECIFIED)            wxFLEX_GROWMODE_SPECIFIED;
 %rename(FLEX_GROWMODE_ALL)                  wxFLEX_GROWMODE_ALL;
 %rename(FlexGridSizer)                      wxFlexGridSizer;

+%rename(StdDialogButtonSizer)               wxStdDialogButtonSizer;

 %rename(GBPosition)                         wxGBPosition;
 %rename(GBSpan)                             wxGBSpan;
 %rename(DefaultSpan)                        wxDefaultSpan;
 %rename(GBPosition)                         wxGBPosition;
 %rename(GBSpan)                             wxGBSpan;
 %rename(DefaultSpan)                        wxDefaultSpan;