Add a set for wxMac too

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

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 4b0a245fa21f48a71c4491089682f860c0c6a6af..644bfe7358566187f797f9e45265d5c9fd99c9e7 100644 (file)
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -438,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;


@@ -615,6 +602,11 @@
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;
 %rename(GetAccelFromString)                 wxGetAccelFromString;
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;
 %rename(GetAccelFromString)                 wxGetAccelFromString;

+%rename(WINDOW_VARIANT_DEFAULT)             wxWINDOW_VARIANT_DEFAULT;
+%rename(WINDOW_VARIANT_NORMAL)              wxWINDOW_VARIANT_NORMAL;
+%rename(WINDOW_VARIANT_SMALL)               wxWINDOW_VARIANT_SMALL;
+%rename(WINDOW_VARIANT_MINI)                wxWINDOW_VARIANT_MINI;
+%rename(WINDOW_VARIANT_LARGE)               wxWINDOW_VARIANT_LARGE;

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