X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aaca5bac6f3ad13add44c220163fda423c40351..9e477492e29e03c02827b1e42a16cb09a13f5149:/wxPython/src/_defs.i?ds=sidebyside diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index b9b3c361c9..7723185846 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -54,7 +54,10 @@ // This one will turn off the generation of the thread wrapper code %define %threadWrapperOff -%exception +%exception { + $action + if (PyErr_Occurred()) SWIG_fail; +} %enddef // Turn it on by default @@ -74,7 +77,7 @@ // This macro can be used to disable the releasing of the GIL when calling the -// C++ function. +// C++ function. This is like using threadWrapperOff for just this function. %define KeepGIL(name) %exception name { $action @@ -155,6 +158,15 @@ typedef unsigned long wxUIntPtr; %typemap(constcode) wxEventType "PyDict_SetItemString(d, \"$symname\", PyInt_FromLong($value));"; +%define %property(NAME, STUFF...) + %pythoncode { NAME = property(STUFF) } +%enddef + + +%define setCallbackInfo(klass) + "klass._setCallbackInfo(self, self, klass)" +%enddef + //---------------------------------------------------------------------- // Macros for the docstring and autodoc features of SWIG. These will @@ -593,6 +605,7 @@ enum { wxID_HELP, wxID_PRINT, wxID_PRINT_SETUP, + wxID_PAGE_SETUP, wxID_PREVIEW, wxID_ABOUT, wxID_HELP_CONTENTS, @@ -604,6 +617,7 @@ enum { wxID_CLOSE_ALL, wxID_PREFERENCES, + wxID_EDIT, wxID_CUT, wxID_COPY, wxID_PASTE, @@ -626,6 +640,7 @@ enum { wxID_VIEW_SORTSIZE, wxID_VIEW_SORTTYPE, + wxID_FILE, wxID_FILE1, wxID_FILE2, wxID_FILE3, @@ -683,20 +698,6 @@ enum { wxID_HIGHEST, - wxACCEL_ALT, - wxACCEL_CTRL, - wxACCEL_SHIFT, - wxACCEL_NORMAL, - - wxPD_AUTO_HIDE, - wxPD_APP_MODAL, - wxPD_CAN_ABORT, - wxPD_ELAPSED_TIME, - wxPD_ESTIMATED_TIME, - wxPD_REMAINING_TIME, - wxPD_SMOOTH, - wxPD_CAN_SKIP, - wxMENU_TEAROFF, wxMB_DOCKABLE, wxNO_FULL_REPAINT_ON_RESIZE, @@ -1215,6 +1216,14 @@ enum wxUpdateUI }; +enum wxLayoutDirection +{ + wxLayout_Default, + wxLayout_LeftToRight, + wxLayout_RightToLeft +}; + + //---------------------------------------------------------------------------