SWIGged updates for wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@17006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/gtk/controls2.cpp

@@ -6315,6 +6315,34 @@ static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args, PyOb
     return _resultobj;
 }
 
+#define wxTreeEvent_IsEditCancelled(_swigobj)  (_swigobj->IsEditCancelled())
+static PyObject *_wrap_wxTreeEvent_IsEditCancelled(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxTreeEvent * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_IsEditCancelled",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTreeEvent_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_IsEditCancelled. Expected _wxTreeEvent_p.");
+        return NULL;
+        }
+    }
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (bool )wxTreeEvent_IsEditCancelled(_arg0);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 static void *SwigwxPyTreeCtrlTowxControl(void *ptr) {
     wxPyTreeCtrl *src;
     wxControl *dest;
@@ -10682,6 +10710,7 @@ static PyMethodDef controls2cMethods[] = {
 	 { "wxTreeCtrl_Create", (PyCFunction) _wrap_wxTreeCtrl_Create, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxPreTreeCtrl", (PyCFunction) _wrap_new_wxPreTreeCtrl, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxTreeCtrl", (PyCFunction) _wrap_new_wxTreeCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_IsEditCancelled", (PyCFunction) _wrap_wxTreeEvent_IsEditCancelled, METH_VARARGS | METH_KEYWORDS },
 	 { "wxTreeEvent_GetLabel", (PyCFunction) _wrap_wxTreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
 	 { "wxTreeEvent_GetKeyCode", (PyCFunction) _wrap_wxTreeEvent_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
 	 { "wxTreeEvent_GetKeyEvent", (PyCFunction) _wrap_wxTreeEvent_GetKeyEvent, METH_VARARGS | METH_KEYWORDS },

wxPython/src/gtk/controls2.py

@@ -869,6 +869,9 @@ class wxTreeEventPtr(wxNotifyEventPtr):
     def GetLabel(self, *_args, **_kwargs):
         val = apply(controls2c.wxTreeEvent_GetLabel,(self,) + _args, _kwargs)
         return val
+    def IsEditCancelled(self, *_args, **_kwargs):
+        val = apply(controls2c.wxTreeEvent_IsEditCancelled,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxTreeEvent instance at %s>" % (self.this,)
     GetCode = GetKeyCode

wxPython/src/gtk/gdi.cpp

@@ -7623,6 +7623,8 @@ static PyObject *_wrap_wxDC_GetBoundingBox(PyObject *self, PyObject *args, PyObj
 }
 
 static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject * pyPens) {
+            wxPyBeginBlockThreads();
+
             bool      isFastSeq  = PyList_Check(pyPoints) || PyTuple_Check(pyPoints);
             bool      isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
             int       numObjs = 0;
@@ -7631,6 +7633,7 @@ static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject *
             PyObject* obj;
             int       x1, y1;
             int       i = 0;
+            PyObject* retval;
 
             if (!PySequence_Check(pyPoints)) {
                 goto err0;
@@ -7673,6 +7676,13 @@ static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject *
                         Py_DECREF(obj);
                     goto err0;
                 }
+                if (PyErr_Occurred()) {
+                    retval = NULL;
+                    if (!isFastPens)
+                        Py_DECREF(obj);
+                    goto exit;
+                }
+
 
                 // Now draw the point
                 self->DrawPoint(x1, y1);
@@ -7682,14 +7692,21 @@ static PyObject * wxDC__DrawPointList(wxDC *self,PyObject * pyPoints,PyObject *
             }
 
             Py_INCREF(Py_None);
-            return Py_None;
+            retval = Py_None;
+            goto exit;
 
         err1:
             PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens");
-            return NULL;
+            retval = NULL;
+            goto exit;
         err0:
             PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x,y) sequences.");
-            return NULL;
+            retval = NULL;
+            goto exit;
+
+        exit:
+            wxPyEndBlockThreads();
+            return retval;
         }
 static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -7731,6 +7748,8 @@ static PyObject *_wrap_wxDC__DrawPointList(PyObject *self, PyObject *args, PyObj
 }
 
 static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * pyPens) {
+            wxPyBeginBlockThreads();
+
             bool      isFastSeq  = PyList_Check(pyLines) || PyTuple_Check(pyLines);
             bool      isFastPens = PyList_Check(pyPens) || PyTuple_Check(pyPens);
             int       numObjs = 0;
@@ -7739,6 +7758,7 @@ static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * py
             PyObject* obj;
             int       x1, y1, x2, y2;
             int       i = 0;
+            PyObject* retval;
 
             if (!PySequence_Check(pyLines)) {
                 goto err0;
@@ -7781,6 +7801,12 @@ static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * py
                         Py_DECREF(obj);
                     goto err0;
                 }
+                if (PyErr_Occurred()) {
+                    retval = NULL;
+                    if (!isFastPens)
+                        Py_DECREF(obj);
+                    goto exit;
+                }
 
                 // Now draw the line
                 self->DrawLine(x1, y1, x2, y2);
@@ -7790,14 +7816,22 @@ static PyObject * wxDC__DrawLineList(wxDC *self,PyObject * pyLines,PyObject * py
             }
 
             Py_INCREF(Py_None);
-            return Py_None;
+            retval = Py_None;
+            goto exit;
 
         err1:
             PyErr_SetString(PyExc_TypeError, "Expected a sequence of wxPens");
-            return NULL;
+            retval = NULL;
+            goto exit;
+
         err0:
             PyErr_SetString(PyExc_TypeError, "Expected a sequence of (x1,y1, x2,y2) sequences.");
-            return NULL;
+            retval = NULL;
+            goto exit;
+
+        exit:
+            wxPyEndBlockThreads();
+            return retval;
         }
 static PyObject *_wrap_wxDC__DrawLineList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;

wxPython/src/gtk/grid.py

@@ -500,6 +500,12 @@ class wxGridCellAttrPtr :
     def SetAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_SetAlignment,(self,) + _args, _kwargs)
         return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_SetOverflow,(self,) + _args, _kwargs)
+        return val
     def SetReadOnly(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_SetReadOnly,(self,) + _args, _kwargs)
         return val
@@ -548,6 +554,12 @@ class wxGridCellAttrPtr :
     def GetAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetAlignment,(self,) + _args, _kwargs)
         return val
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_GetSize,(self,) + _args, _kwargs)
+        return val
+    def GetOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGridCellAttr_GetOverflow,(self,) + _args, _kwargs)
+        return val
     def GetRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGridCellAttr_GetRenderer,(self,) + _args, _kwargs)
         return val
@@ -1000,6 +1012,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def ForceRefresh(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_ForceRefresh,(self,) + _args, _kwargs)
         return val
+    def Refresh(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_Refresh,(self,) + _args, _kwargs)
+        return val
     def IsEditable(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_IsEditable,(self,) + _args, _kwargs)
         return val
@@ -1214,6 +1229,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def CanDragGridSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_CanDragGridSize,(self,) + _args, _kwargs)
         return val
+    def SetAttr(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetAttr,(self,) + _args, _kwargs)
+        return val
     def SetRowAttr(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetRowAttr,(self,) + _args, _kwargs)
         return val
@@ -1280,6 +1298,15 @@ class wxGridPtr(wxScrolledWindowPtr):
     def GetCellAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_GetCellAlignment,(self,) + _args, _kwargs)
         return val
+    def GetDefaultCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetDefaultCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def GetCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def GetCellSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellSize,(self,) + _args, _kwargs)
+        return val
     def SetDefaultRowSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetDefaultRowSize,(self,) + _args, _kwargs)
         return val
@@ -1337,6 +1364,15 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetCellAlignment(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetCellAlignment,(self,) + _args, _kwargs)
         return val
+    def SetDefaultCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetDefaultCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def SetCellOverflow(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellOverflow,(self,) + _args, _kwargs)
+        return val
+    def SetCellSize(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellSize,(self,) + _args, _kwargs)
+        return val
     def SetDefaultRenderer(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetDefaultRenderer,(self,) + _args, _kwargs)
         return val

wxPython/src/gtk/misc2.py

@@ -216,6 +216,9 @@ class wxTipProviderPtr :
     def GetCurrentTip(self, *_args, **_kwargs):
         val = apply(misc2c.wxTipProvider_GetCurrentTip,(self,) + _args, _kwargs)
         return val
+    def PreprocessTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxTipProvider_PreprocessTip,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxTipProvider instance at %s>" % (self.this,)
 class wxTipProvider(wxTipProviderPtr):
@@ -1026,6 +1029,92 @@ class wxFileHistory(wxFileHistoryPtr):
 
 
 
+class wxEffectsPtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetHighlightColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetHighlightColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetLightShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetLightShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetFaceColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetFaceColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetMediumShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetMediumShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def GetDarkShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_GetDarkShadow,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
+    def SetHighlightColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetHighlightColour,(self,) + _args, _kwargs)
+        return val
+    def SetLightShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetLightShadow,(self,) + _args, _kwargs)
+        return val
+    def SetFaceColour(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetFaceColour,(self,) + _args, _kwargs)
+        return val
+    def SetMediumShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetMediumShadow,(self,) + _args, _kwargs)
+        return val
+    def SetDarkShadow(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_SetDarkShadow,(self,) + _args, _kwargs)
+        return val
+    def Set(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_Set,(self,) + _args, _kwargs)
+        return val
+    def DrawSunkenEdge(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_DrawSunkenEdge,(self,) + _args, _kwargs)
+        return val
+    def TileBitmap(self, *_args, **_kwargs):
+        val = apply(misc2c.wxEffects_TileBitmap,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxEffects instance at %s>" % (self.this,)
+class wxEffects(wxEffectsPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxEffects,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxSingleInstanceCheckerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxSingleInstanceChecker(self)
+    def Create(self, *_args, **_kwargs):
+        val = apply(misc2c.wxSingleInstanceChecker_Create,(self,) + _args, _kwargs)
+        return val
+    def IsAnotherRunning(self, *_args, **_kwargs):
+        val = apply(misc2c.wxSingleInstanceChecker_IsAnotherRunning,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxSingleInstanceChecker instance at %s>" % (self.this,)
+class wxSingleInstanceChecker(wxSingleInstanceCheckerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxSingleInstanceChecker,_args,_kwargs)
+        self.thisown = 1
+
+
+
+def wxPreSingleInstanceChecker(*_args,**_kwargs):
+    val = wxSingleInstanceCheckerPtr(apply(misc2c.new_wxPreSingleInstanceChecker,_args,_kwargs))
+    val.thisown = 1
+    return val
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -1239,6 +1328,8 @@ wxLog_RemoveTraceMask = misc2c.wxLog_RemoveTraceMask
 
 wxLog_ClearTraceMasks = misc2c.wxLog_ClearTraceMasks
 
+wxLog_GetTraceMasks = misc2c.wxLog_GetTraceMasks
+
 wxLog_SetTimestamp = misc2c.wxLog_SetTimestamp
 
 wxLog_GetTimestamp = misc2c.wxLog_GetTimestamp

wxPython/src/gtk/wx.cpp

@@ -1413,6 +1413,37 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args, PyObj
     return _resultobj;
 }
 
+#define wxPyApp_Yield(_swigobj,_swigarg0)  (_swigobj->Yield(_swigarg0))
+static PyObject *_wrap_wxPyApp_Yield(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxPyApp * _arg0;
+    bool  _arg1 = (bool ) (0);
+    PyObject * _argo0 = 0;
+    int tempbool1 = (int) (0);
+    char *_kwnames[] = { "self","onlyIfNeeded", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxPyApp_Yield",_kwnames,&_argo0,&tempbool1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_Yield. Expected _wxPyApp_p.");
+        return NULL;
+        }
+    }
+    _arg1 = (bool ) tempbool1;
+{
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    _result = (bool )wxPyApp_Yield(_arg0,_arg1);
+
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) return NULL;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
 #define wxPyApp_SetAppName(_swigobj,_swigarg0)  (_swigobj->SetAppName(_swigarg0))
 static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -1666,6 +1697,7 @@ static PyMethodDef wxcMethods[] = {
 	 { "wxPyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyApp_SetClassName", (PyCFunction) _wrap_wxPyApp_SetClassName, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyApp_SetAppName", (PyCFunction) _wrap_wxPyApp_SetAppName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_Yield", (PyCFunction) _wrap_wxPyApp_Yield, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyApp_ProcessIdle", (PyCFunction) _wrap_wxPyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyApp_Pending", (PyCFunction) _wrap_wxPyApp_Pending, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPyApp_MainLoop", (PyCFunction) _wrap_wxPyApp_MainLoop, METH_VARARGS | METH_KEYWORDS },
@@ -1917,6 +1949,10 @@ SWIGEXPORT(void) initwxc() {
 	 PyDict_SetItemString(d,"wxTE_DONTWRAP", PyInt_FromLong((long) wxTE_DONTWRAP));
 	 PyDict_SetItemString(d,"wxTE_LINEWRAP", PyInt_FromLong((long) wxTE_LINEWRAP));
 	 PyDict_SetItemString(d,"wxTE_WORDWRAP", PyInt_FromLong((long) wxTE_WORDWRAP));
+	 PyDict_SetItemString(d,"wxTE_LEFT", PyInt_FromLong((long) wxTE_LEFT));
+	 PyDict_SetItemString(d,"wxTE_RIGHT", PyInt_FromLong((long) wxTE_RIGHT));
+	 PyDict_SetItemString(d,"wxTE_CENTER", PyInt_FromLong((long) wxTE_CENTER));
+	 PyDict_SetItemString(d,"wxTE_CENTRE", PyInt_FromLong((long) wxTE_CENTRE));
 	 PyDict_SetItemString(d,"wxCB_SIMPLE", PyInt_FromLong((long) wxCB_SIMPLE));
 	 PyDict_SetItemString(d,"wxCB_DROPDOWN", PyInt_FromLong((long) wxCB_DROPDOWN));
 	 PyDict_SetItemString(d,"wxCB_SORT", PyInt_FromLong((long) wxCB_SORT));

wxPython/src/gtk/wx.py

@@ -88,6 +88,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
     def ProcessIdle(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs)
         return val
+    def Yield(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_Yield,(self,) + _args, _kwargs)
+        return val
     def SetAppName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs)
         return val
@@ -255,6 +258,10 @@ wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
 wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
 wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
 wxTE_WORDWRAP = wxc.wxTE_WORDWRAP
+wxTE_LEFT = wxc.wxTE_LEFT
+wxTE_RIGHT = wxc.wxTE_RIGHT
+wxTE_CENTER = wxc.wxTE_CENTER
+wxTE_CENTRE = wxc.wxTE_CENTRE
 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT