move the nodefault option into _defs.i too.

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

diff --git a/wxPython/src/__core_rename.i b/wxPython/src/__core_rename.i
index f83a845e5927108688d8035b40c49898d156e7fc..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;


@@ -94,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;


@@ -102,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;


@@ -305,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;


@@ -400,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;


@@ -427,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;


@@ -501,12 +556,21 @@
 %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;


@@ -599,6 +663,7 @@
 %rename(SetDefaultPyEncoding)               wxSetDefaultPyEncoding;
 %rename(GetDefaultPyEncoding)               wxGetDefaultPyEncoding;
 %rename(EventLoop)                          wxEventLoop;
 %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;