Don't use PyThreadState_Swap to get the current tstate, block threads

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

diff --git a/wxPython/src/_pycontrol.i b/wxPython/src/_pycontrol.i
index cc792bd9682bd32de03544eb7675eada6787f6a5..2037153d7007524b32bd202367b722e1f4635094 100644 (file)
--- a/wxPython/src/_pycontrol.i
+++ b/wxPython/src/_pycontrol.i
@@ -60,6 +60,8 @@ public:
     DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
     DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
 
+    DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
+    
     PYPRIVATE;
 };
 
@@ -89,13 +91,14 @@ IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, GetMaxSize);
 IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, AddChild);
 IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
 
+IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, ShouldInheritColours);
 %}
 
 // And now the one for SWIG to see
 class wxPyControl : public wxControl
 {
 public:
-    %addtofunc wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
+    %pythonAppend wxPyControl         "self._setOORInfo(self); self._setCallbackInfo(self, PyControl)"
 
     wxPyControl(wxWindow* parent, const wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
@@ -115,9 +118,15 @@ public:
     void base_DoSetClientSize(int width, int height);
     void base_DoSetVirtualSize( int x, int y );
 
-    void base_DoGetSize( int *OUTPUT, int *OUTPUT ) const;
-    void base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const;
-    void base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const;
+    DocDeclA(
+        void, base_DoGetSize( int *OUTPUT, int *OUTPUT ) const,
+        "base_DoGetSize() -> (width, height)");
+    DocDeclA(
+        void, base_DoGetClientSize( int *OUTPUT, int *OUTPUT ) const,
+        "base_DoGetClientSize() -> (width, height)");
+    DocDeclA(
+        void, base_DoGetPosition( int *OUTPUT, int *OUTPUT ) const,
+        "base_DoGetPosition() -> (x,y)");
 
     wxSize base_DoGetVirtualSize() const;
     wxSize base_DoGetBestSize() const;