some docstring changes

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 2d5bad3926162d6db8903125e499b1a0d00da922..a7e862a5158feb7e7115b2d0cef4f90fc4bb0951 100644 (file)
--- 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
 
 // 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
 %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
 
 
 // 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
 %define KeepGIL(name)
 %exception name {
     $action


@@ -155,6 +158,11 @@ typedef unsigned long   wxUIntPtr;
 %typemap(constcode) wxEventType "PyDict_SetItemString(d, \"$symname\", PyInt_FromLong($value));";
 
 
 %typemap(constcode) wxEventType "PyDict_SetItemString(d, \"$symname\", PyInt_FromLong($value));";
 
 

+%define %property(NAME, STUFF...)
+    %pythoncode {
+        NAME = property(STUFF)
+    }
+%enddef

 
 //----------------------------------------------------------------------
 // Macros for the docstring and autodoc features of SWIG.  These will
 
 //----------------------------------------------------------------------
 // Macros for the docstring and autodoc features of SWIG.  These will


@@ -490,6 +498,8 @@ enum {
     wxCLIP_CHILDREN,
     wxCLIP_SIBLINGS,
 
     wxCLIP_CHILDREN,
     wxCLIP_SIBLINGS,
 

+    wxWINDOW_STYLE_MASK,
+    

     wxALWAYS_SHOW_SB,
     
     wxRETAINED,
     wxALWAYS_SHOW_SB,
     
     wxRETAINED,


@@ -591,12 +601,15 @@ enum {
     wxID_HELP,
     wxID_PRINT,
     wxID_PRINT_SETUP,
     wxID_HELP,
     wxID_PRINT,
     wxID_PRINT_SETUP,

+    wxID_PAGE_SETUP,

     wxID_PREVIEW,
     wxID_ABOUT,
     wxID_HELP_CONTENTS,
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
     wxID_PREVIEW,
     wxID_ABOUT,
     wxID_HELP_CONTENTS,
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,

+    wxID_HELP_INDEX,
+    wxID_HELP_SEARCH,

     wxID_CLOSE_ALL,
     wxID_PREFERENCES,
 
     wxID_CLOSE_ALL,
     wxID_PREFERENCES,
 


@@ -679,19 +692,6 @@ enum {
    
     wxID_HIGHEST,
 
    
     wxID_HIGHEST,
 

-    wxOPEN,
-    wxSAVE,
-    wxHIDE_READONLY,
-    wxOVERWRITE_PROMPT,
-    wxFILE_MUST_EXIST,
-    wxMULTIPLE,
-    wxCHANGE_DIR,
-
-    wxACCEL_ALT,
-    wxACCEL_CTRL,
-    wxACCEL_SHIFT,
-    wxACCEL_NORMAL,
-

     wxPD_AUTO_HIDE,
     wxPD_APP_MODAL,
     wxPD_CAN_ABORT,
     wxPD_AUTO_HIDE,
     wxPD_APP_MODAL,
     wxPD_CAN_ABORT,


@@ -701,10 +701,6 @@ enum {
     wxPD_SMOOTH,
     wxPD_CAN_SKIP,
 
     wxPD_SMOOTH,
     wxPD_CAN_SKIP,
 

-    wxDD_NEW_DIR_BUTTON,
-    wxDD_DEFAULT_STYLE,
-    wxDD_CHANGE_DIR,
-    

     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,
     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,