reSWIGged

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

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 79eb43f863f3e7c7a3b7db3566f8f40aa0b49d67..6d93a6256219161d1fa70df88fec2d9cc823701a 100644 (file)
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -1,7 +1,7 @@
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 
 // A bunch of %rename directives generated by ./distrib/build_renamers.py
 // in order to remove the wx prefix from all global scope names.
 

-#ifndef SWIGXML
+#ifndef BUILDING_RENAMERS

 
 %rename(NOT_FOUND)                          wxNOT_FOUND;
 %rename(VSCROLL)                            wxVSCROLL;
 
 %rename(NOT_FOUND)                          wxNOT_FOUND;
 %rename(VSCROLL)                            wxVSCROLL;


@@ -224,6 +224,7 @@
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;
 %rename(MB_DOCKABLE)                        wxMB_DOCKABLE;
 %rename(NO_FULL_REPAINT_ON_RESIZE)          wxNO_FULL_REPAINT_ON_RESIZE;
 %rename(MENU_TEAROFF)                       wxMENU_TEAROFF;
 %rename(MB_DOCKABLE)                        wxMB_DOCKABLE;
 %rename(NO_FULL_REPAINT_ON_RESIZE)          wxNO_FULL_REPAINT_ON_RESIZE;

+%rename(FULL_REPAINT_ON_RESIZE)             wxFULL_REPAINT_ON_RESIZE;

 %rename(LI_HORIZONTAL)                      wxLI_HORIZONTAL;
 %rename(LI_VERTICAL)                        wxLI_VERTICAL;
 %rename(WS_EX_VALIDATE_RECURSIVELY)         wxWS_EX_VALIDATE_RECURSIVELY;
 %rename(LI_HORIZONTAL)                      wxLI_HORIZONTAL;
 %rename(LI_VERTICAL)                        wxLI_VERTICAL;
 %rename(WS_EX_VALIDATE_RECURSIVELY)         wxWS_EX_VALIDATE_RECURSIVELY;


@@ -437,36 +438,23 @@
 %rename(Object)                             wxObject;
 %rename(BITMAP_TYPE_INVALID)                wxBITMAP_TYPE_INVALID;
 %rename(BITMAP_TYPE_BMP)                    wxBITMAP_TYPE_BMP;
 %rename(Object)                             wxObject;
 %rename(BITMAP_TYPE_INVALID)                wxBITMAP_TYPE_INVALID;
 %rename(BITMAP_TYPE_BMP)                    wxBITMAP_TYPE_BMP;

-%rename(BITMAP_TYPE_BMP_RESOURCE)           wxBITMAP_TYPE_BMP_RESOURCE;
-%rename(BITMAP_TYPE_RESOURCE)               wxBITMAP_TYPE_RESOURCE;

 %rename(BITMAP_TYPE_ICO)                    wxBITMAP_TYPE_ICO;
 %rename(BITMAP_TYPE_ICO)                    wxBITMAP_TYPE_ICO;

-%rename(BITMAP_TYPE_ICO_RESOURCE)           wxBITMAP_TYPE_ICO_RESOURCE;

 %rename(BITMAP_TYPE_CUR)                    wxBITMAP_TYPE_CUR;
 %rename(BITMAP_TYPE_CUR)                    wxBITMAP_TYPE_CUR;

-%rename(BITMAP_TYPE_CUR_RESOURCE)           wxBITMAP_TYPE_CUR_RESOURCE;

 %rename(BITMAP_TYPE_XBM)                    wxBITMAP_TYPE_XBM;
 %rename(BITMAP_TYPE_XBM_DATA)               wxBITMAP_TYPE_XBM_DATA;
 %rename(BITMAP_TYPE_XPM)                    wxBITMAP_TYPE_XPM;
 %rename(BITMAP_TYPE_XPM_DATA)               wxBITMAP_TYPE_XPM_DATA;
 %rename(BITMAP_TYPE_TIF)                    wxBITMAP_TYPE_TIF;
 %rename(BITMAP_TYPE_XBM)                    wxBITMAP_TYPE_XBM;
 %rename(BITMAP_TYPE_XBM_DATA)               wxBITMAP_TYPE_XBM_DATA;
 %rename(BITMAP_TYPE_XPM)                    wxBITMAP_TYPE_XPM;
 %rename(BITMAP_TYPE_XPM_DATA)               wxBITMAP_TYPE_XPM_DATA;
 %rename(BITMAP_TYPE_TIF)                    wxBITMAP_TYPE_TIF;

-%rename(BITMAP_TYPE_TIF_RESOURCE)           wxBITMAP_TYPE_TIF_RESOURCE;

 %rename(BITMAP_TYPE_GIF)                    wxBITMAP_TYPE_GIF;
 %rename(BITMAP_TYPE_GIF)                    wxBITMAP_TYPE_GIF;

-%rename(BITMAP_TYPE_GIF_RESOURCE)           wxBITMAP_TYPE_GIF_RESOURCE;

 %rename(BITMAP_TYPE_PNG)                    wxBITMAP_TYPE_PNG;
 %rename(BITMAP_TYPE_PNG)                    wxBITMAP_TYPE_PNG;

-%rename(BITMAP_TYPE_PNG_RESOURCE)           wxBITMAP_TYPE_PNG_RESOURCE;

 %rename(BITMAP_TYPE_JPEG)                   wxBITMAP_TYPE_JPEG;
 %rename(BITMAP_TYPE_JPEG)                   wxBITMAP_TYPE_JPEG;

-%rename(BITMAP_TYPE_JPEG_RESOURCE)          wxBITMAP_TYPE_JPEG_RESOURCE;

 %rename(BITMAP_TYPE_PNM)                    wxBITMAP_TYPE_PNM;
 %rename(BITMAP_TYPE_PNM)                    wxBITMAP_TYPE_PNM;

-%rename(BITMAP_TYPE_PNM_RESOURCE)           wxBITMAP_TYPE_PNM_RESOURCE;

 %rename(BITMAP_TYPE_PCX)                    wxBITMAP_TYPE_PCX;
 %rename(BITMAP_TYPE_PCX)                    wxBITMAP_TYPE_PCX;

-%rename(BITMAP_TYPE_PCX_RESOURCE)           wxBITMAP_TYPE_PCX_RESOURCE;

 %rename(BITMAP_TYPE_PICT)                   wxBITMAP_TYPE_PICT;
 %rename(BITMAP_TYPE_PICT)                   wxBITMAP_TYPE_PICT;

-%rename(BITMAP_TYPE_PICT_RESOURCE)          wxBITMAP_TYPE_PICT_RESOURCE;

 %rename(BITMAP_TYPE_ICON)                   wxBITMAP_TYPE_ICON;
 %rename(BITMAP_TYPE_ICON)                   wxBITMAP_TYPE_ICON;

-%rename(BITMAP_TYPE_ICON_RESOURCE)          wxBITMAP_TYPE_ICON_RESOURCE;

 %rename(BITMAP_TYPE_ANI)                    wxBITMAP_TYPE_ANI;
 %rename(BITMAP_TYPE_IFF)                    wxBITMAP_TYPE_IFF;
 %rename(BITMAP_TYPE_MACCURSOR)              wxBITMAP_TYPE_MACCURSOR;
 %rename(BITMAP_TYPE_ANI)                    wxBITMAP_TYPE_ANI;
 %rename(BITMAP_TYPE_IFF)                    wxBITMAP_TYPE_IFF;
 %rename(BITMAP_TYPE_MACCURSOR)              wxBITMAP_TYPE_MACCURSOR;

-%rename(BITMAP_TYPE_MACCURSOR_RESOURCE)     wxBITMAP_TYPE_MACCURSOR_RESOURCE;

 %rename(BITMAP_TYPE_ANY)                    wxBITMAP_TYPE_ANY;
 %rename(CURSOR_NONE)                        wxCURSOR_NONE;
 %rename(CURSOR_ARROW)                       wxCURSOR_ARROW;
 %rename(BITMAP_TYPE_ANY)                    wxBITMAP_TYPE_ANY;
 %rename(CURSOR_NONE)                        wxCURSOR_NONE;
 %rename(CURSOR_ARROW)                       wxCURSOR_ARROW;


@@ -610,6 +598,10 @@
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;
 %rename(GetApp)                             wxGetApp;
 %rename(PostEvent)                          wxPostEvent;
 %rename(App_CleanUp)                        wxApp_CleanUp;
 %rename(GetApp)                             wxGetApp;

+%rename(AcceleratorEntry)                   wxAcceleratorEntry;
+%rename(AcceleratorTable)                   wxAcceleratorTable;
+%rename(NullAcceleratorTable)               wxNullAcceleratorTable;
+%rename(GetAccelFromString)                 wxGetAccelFromString;

 %rename(Window)                             wxWindow;
 %rename(FindWindowById)                     wxFindWindowById;
 %rename(FindWindowByName)                   wxFindWindowByName;
 %rename(Window)                             wxWindow;
 %rename(FindWindowById)                     wxFindWindowById;
 %rename(FindWindowByName)                   wxFindWindowByName;