Moved some enums around to better match the C++ headers

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

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 4b0a245fa21f48a71c4491089682f860c0c6a6af..67528579ab2aa20716b6eafb367fe8bb8fe48301 100644 (file)
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -15,37 +15,12 @@
 %rename(STATIC_BORDER)                      wxSTATIC_BORDER;
 %rename(TRANSPARENT_WINDOW)                 wxTRANSPARENT_WINDOW;
 %rename(NO_BORDER)                          wxNO_BORDER;
-%rename(USER_COLOURS)                       wxUSER_COLOURS;
-%rename(NO_3D)                              wxNO_3D;
 %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(STAY_ON_TOP)                        wxSTAY_ON_TOP;
-%rename(ICONIZE)                            wxICONIZE;
-%rename(MINIMIZE)                           wxMINIMIZE;
-%rename(MAXIMIZE)                           wxMAXIMIZE;
-%rename(CLOSE_BOX)                          wxCLOSE_BOX;
-%rename(THICK_FRAME)                        wxTHICK_FRAME;
-%rename(SYSTEM_MENU)                        wxSYSTEM_MENU;
-%rename(MINIMIZE_BOX)                       wxMINIMIZE_BOX;
-%rename(MAXIMIZE_BOX)                       wxMAXIMIZE_BOX;
-%rename(TINY_CAPTION_HORIZ)                 wxTINY_CAPTION_HORIZ;
-%rename(TINY_CAPTION_VERT)                  wxTINY_CAPTION_VERT;
-%rename(RESIZE_BOX)                         wxRESIZE_BOX;
-%rename(RESIZE_BORDER)                      wxRESIZE_BORDER;
-%rename(DIALOG_MODAL)                       wxDIALOG_MODAL;
-%rename(DIALOG_MODELESS)                    wxDIALOG_MODELESS;
-%rename(DIALOG_NO_PARENT)                   wxDIALOG_NO_PARENT;
-%rename(DEFAULT_FRAME_STYLE)                wxDEFAULT_FRAME_STYLE;
-%rename(DEFAULT_DIALOG_STYLE)               wxDEFAULT_DIALOG_STYLE;
-%rename(FRAME_TOOL_WINDOW)                  wxFRAME_TOOL_WINDOW;
-%rename(FRAME_FLOAT_ON_PARENT)              wxFRAME_FLOAT_ON_PARENT;
-%rename(FRAME_NO_WINDOW_MENU)               wxFRAME_NO_WINDOW_MENU;
-%rename(FRAME_NO_TASKBAR)                   wxFRAME_NO_TASKBAR;
-%rename(FRAME_SHAPED)                       wxFRAME_SHAPED;
 %rename(ED_CLIENT_MARGIN)                   wxED_CLIENT_MARGIN;
 %rename(ED_BUTTONS_BOTTOM)                  wxED_BUTTONS_BOTTOM;
 %rename(ED_BUTTONS_RIGHT)                   wxED_BUTTONS_RIGHT;
@@ -276,8 +251,9 @@
 %rename(GROW)                               wxGROW;
 %rename(EXPAND)                             wxEXPAND;
 %rename(SHAPED)                             wxSHAPED;
-%rename(ADJUST_MINSIZE)                     wxADJUST_MINSIZE;
+%rename(FIXED_MINSIZE)                      wxFIXED_MINSIZE;
 %rename(TILE)                               wxTILE;
+%rename(ADJUST_MINSIZE)                     wxADJUST_MINSIZE;
 %rename(BORDER_DEFAULT)                     wxBORDER_DEFAULT;
 %rename(BORDER_NONE)                        wxBORDER_NONE;
 %rename(BORDER_STATIC)                      wxBORDER_STATIC;
@@ -438,36 +414,23 @@
 %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_RESOURCE)           wxBITMAP_TYPE_ICO_RESOURCE;
 %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_TIF_RESOURCE)           wxBITMAP_TYPE_TIF_RESOURCE;
 %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_RESOURCE)           wxBITMAP_TYPE_PNG_RESOURCE;
 %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_RESOURCE)           wxBITMAP_TYPE_PNM_RESOURCE;
 %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_RESOURCE)          wxBITMAP_TYPE_PICT_RESOURCE;
 %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_MACCURSOR_RESOURCE)     wxBITMAP_TYPE_MACCURSOR_RESOURCE;
 %rename(BITMAP_TYPE_ANY)                    wxBITMAP_TYPE_ANY;
 %rename(CURSOR_NONE)                        wxCURSOR_NONE;
 %rename(CURSOR_ARROW)                       wxCURSOR_ARROW;
@@ -615,6 +578,12 @@
 %rename(AcceleratorTable)                   wxAcceleratorTable;
 %rename(NullAcceleratorTable)               wxNullAcceleratorTable;
 %rename(GetAccelFromString)                 wxGetAccelFromString;
+%rename(VisualAttributes)                   wxVisualAttributes;
+%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_VARIANT_MAX)                 wxWINDOW_VARIANT_MAX;
 %rename(Window)                             wxWindow;
 %rename(FindWindowById)                     wxFindWindowById;
 %rename(FindWindowByName)                   wxFindWindowByName;