Use a swig macro for generating the call to the _setCallbackInfo

function so it's easy to fiddle with, if needed. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-11-14 22:03:54 +00:00
parent 13b955a755
commit c25f90f60c
76 changed files with 348 additions and 331 deletions
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -4455,7 +4455,7 @@ class ListCtrl(_core.Control):
            Validator validator=DefaultValidator, String name=ListCtrlNameStr) -> ListCtrl
        """
        _controls_.ListCtrl_swiginit(self,_controls_.new_ListCtrl(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)
+        self._setOORInfo(self);ListCtrl._setCallbackInfo(self, self, ListCtrl)

    def Create(*args, **kwargs):
        """
@@ -5178,7 +5178,7 @@ class TreeCtrl(_core.Control):
            String name=TreeCtrlNameStr) -> TreeCtrl
        """
        _controls_.TreeCtrl_swiginit(self,_controls_.new_TreeCtrl(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, TreeCtrl)
+        self._setOORInfo(self);TreeCtrl._setCallbackInfo(self, self, TreeCtrl)

    def Create(*args, **kwargs):
        """
@@ -5740,7 +5740,7 @@ class PyControl(_core.Control):
            String name=ControlNameStr) -> PyControl
        """
        _controls_.PyControl_swiginit(self,_controls_.new_PyControl(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyControl)
+        self._setOORInfo(self);PyControl._setCallbackInfo(self, self, PyControl)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
--- a/wxPython/src/gtk/_controls_wrap.cpp
+++ b/wxPython/src/gtk/_controls_wrap.cpp
@@ -3067,7 +3067,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxPyListCtrl, wxListCtrl);
 IMP_PYCALLBACK_STRING_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemText);
 IMP_PYCALLBACK_LISTATTR_LONG(wxPyListCtrl, wxListCtrl, OnGetItemAttr);
 IMP_PYCALLBACK_INT_LONG_virtual(wxPyListCtrl, wxListCtrl, OnGetItemImage);
-IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage); 
+IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage);


 SWIGINTERN wxListItem *wxPyListCtrl_GetColumn(wxPyListCtrl *self,int col){
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -2070,7 +2070,7 @@ class FileSystemHandler(CPPFileSystemHandler):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> FileSystemHandler"""
        _core_.FileSystemHandler_swiginit(self,_core_.new_FileSystemHandler(*args, **kwargs))
-        self._setCallbackInfo(self, FileSystemHandler)
+        FileSystemHandler._setCallbackInfo(self, self, FileSystemHandler)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -7007,13 +7007,12 @@ class PyApp(EvtHandler):
        Create a new application object, starting the bootstrap process.
        """
        _core_.PyApp_swiginit(self,_core_.new_PyApp(*args, **kwargs))
-        self._setCallbackInfo(self, PyApp, False)
-        self._setOORInfo(self, False)
+        self._setOORInfo(self, False);PyApp._setCallbackInfo(self, self, PyApp)

    __swig_destroy__ = _core_.delete_PyApp
    __del__ = lambda self : None;
    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref=False)"""
        return _core_.PyApp__setCallbackInfo(*args, **kwargs)

    def GetAppName(*args, **kwargs):
@@ -10332,7 +10331,7 @@ class Window(EvtHandler):
        if hasattr(self, '_setOORInfo'):
            self._setOORInfo(self)
        if hasattr(self, '_setCallbackInfo'):
-            self._setCallbackInfo(self, self.__class__)
+            self._setCallbackInfo(self, pre.__class__)

    def SendSizeEvent(self):
        self.GetEventHandler().ProcessEvent(wx.SizeEvent((-1,-1)))
@@ -10601,12 +10600,10 @@ class PyValidator(Validator):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyValidator"""
        _core_.PyValidator_swiginit(self,_core_.new_PyValidator(*args, **kwargs))
-        
-        self._setCallbackInfo(self, PyValidator, 1)
-        self._setOORInfo(self)
+        self._setOORInfo(self);PyValidator._setCallbackInfo(self, self, PyValidator)

    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=True)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)"""
        return _core_.PyValidator__setCallbackInfo(*args, **kwargs)

 _core_.PyValidator_swigregister(PyValidator)
@@ -12432,7 +12429,7 @@ class PySizer(Sizer):
        class.
        """
        _core_.PySizer_swiginit(self,_core_.new_PySizer(*args, **kwargs))
-        self._setCallbackInfo(self, PySizer);self._setOORInfo(self)
+        self._setOORInfo(self);PySizer._setCallbackInfo(self, self, PySizer)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -29956,7 +29956,7 @@ SWIGINTERN PyObject *_wrap_PyApp__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self)
  wxPyApp *arg1 = (wxPyApp *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  bool arg4 ;
+  bool arg4 = (bool) false ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  bool val4 ;
@@ -29969,7 +29969,7 @@ SWIGINTERN PyObject *_wrap_PyApp__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self)
    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:PyApp__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyApp, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyApp__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyApp *""'"); 
@@ -29977,11 +29977,13 @@ SWIGINTERN PyObject *_wrap_PyApp__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self)
  arg1 = reinterpret_cast< wxPyApp * >(argp1);
  arg2 = obj1;
  arg3 = obj2;
-  ecode4 = SWIG_AsVal_bool(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyApp__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = static_cast< bool >(val4);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_bool(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "PyApp__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'");
+    } 
+    arg4 = static_cast< bool >(val4);
+  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
@@ -41524,7 +41526,7 @@ SWIGINTERN PyObject *_wrap_PyValidator__setCallbackInfo(PyObject *SWIGUNUSEDPARM
  wxPyValidator *arg1 = (wxPyValidator *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  int arg4 = (int) true ;
+  int arg4 = (int) 1 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  int val4 ;
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -2317,12 +2317,12 @@ class FontEnumerator(object):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> FontEnumerator"""
        _gdi_.FontEnumerator_swiginit(self,_gdi_.new_FontEnumerator(*args, **kwargs))
-        self._setCallbackInfo(self, FontEnumerator, 0)
+        FontEnumerator._setCallbackInfo(self, self, FontEnumerator)

    __swig_destroy__ = _gdi_.delete_FontEnumerator
    __del__ = lambda self : None;
    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, bool incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
        return _gdi_.FontEnumerator__setCallbackInfo(*args, **kwargs)

    def EnumerateFacenames(*args, **kwargs):
@@ -2784,7 +2784,7 @@ class PyLocale(Locale):
    def __init__(self, *args, **kwargs): 
        """__init__(self, int language=-1, int flags=wxLOCALE_LOAD_DEFAULT|wxLOCALE_CONV_ENCODING) -> PyLocale"""
        _gdi_.PyLocale_swiginit(self,_gdi_.new_PyLocale(*args, **kwargs))
-        self._setCallbackInfo(self, PyLocale)
+        PyLocale._setCallbackInfo(self, self, PyLocale)

    __swig_destroy__ = _gdi_.delete_PyLocale
    __del__ = lambda self : None;
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -15460,10 +15460,10 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  bool arg4 ;
+  int arg4 = (int) 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
-  bool val4 ;
+  int val4 ;
  int ecode4 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
@@ -15473,7 +15473,7 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:FontEnumerator__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyFontEnumerator, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
@@ -15481,11 +15481,13 @@ SWIGINTERN PyObject *_wrap_FontEnumerator__setCallbackInfo(PyObject *SWIGUNUSEDP
  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
  arg2 = obj1;
  arg3 = obj2;
-  ecode4 = SWIG_AsVal_bool(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "bool""'");
-  } 
-  arg4 = static_cast< bool >(val4);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "FontEnumerator__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -1249,7 +1249,7 @@ class PyTipProvider(TipProvider):
    def __init__(self, *args, **kwargs): 
        """__init__(self, size_t currentTip) -> PyTipProvider"""
        _misc_.PyTipProvider_swiginit(self,_misc_.new_PyTipProvider(*args, **kwargs))
-        self._setCallbackInfo(self, PyTipProvider)
+        PyTipProvider._setCallbackInfo(self, self, PyTipProvider)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1277,12 +1277,12 @@ class Timer(_core.EvtHandler):
    def __init__(self, *args, **kwargs): 
        """__init__(self, EvtHandler owner=None, int id=ID_ANY) -> Timer"""
        _misc_.Timer_swiginit(self,_misc_.new_Timer(*args, **kwargs))
-        self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self, 0)
+        self._setOORInfo(self, 0);Timer._setCallbackInfo(self, self, Timer)

    __swig_destroy__ = _misc_.delete_Timer
    __del__ = lambda self : None;
    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=1)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
        return _misc_.Timer__setCallbackInfo(*args, **kwargs)

    def SetOwner(*args, **kwargs):
@@ -1823,7 +1823,7 @@ class PyLog(Log):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyLog"""
        _misc_.PyLog_swiginit(self,_misc_.new_PyLog(*args, **kwargs))
-        self._setCallbackInfo(self, PyLog)
+        PyLog._setCallbackInfo(self, self, PyLog)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1881,7 +1881,7 @@ class Process(_core.EvtHandler):
    def __init__(self, *args, **kwargs): 
        """__init__(self, EvtHandler parent=None, int id=-1) -> Process"""
        _misc_.Process_swiginit(self,_misc_.new_Process(*args, **kwargs))
-        self._setCallbackInfo(self, Process); self.this.own(False)
+        Process._setCallbackInfo(self, self, Process); self.this.own(False)

    __swig_destroy__ = _misc_.delete_Process
    __del__ = lambda self : None;
@@ -2650,7 +2650,7 @@ class ArtProvider(object):

        """
        _misc_.ArtProvider_swiginit(self,_misc_.new_ArtProvider(*args, **kwargs))
-        self._setCallbackInfo(self, ArtProvider)
+        ArtProvider._setCallbackInfo(self, self, ArtProvider)

    __swig_destroy__ = _misc_.delete_ArtProvider
    __del__ = lambda self : None;
@@ -4899,7 +4899,7 @@ class PyDataObjectSimple(DataObjectSimple):

        """
        _misc_.PyDataObjectSimple_swiginit(self,_misc_.new_PyDataObjectSimple(*args, **kwargs))
-        self._setCallbackInfo(self, PyDataObjectSimple)
+        PyDataObjectSimple._setCallbackInfo(self, self, PyDataObjectSimple)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5048,7 +5048,7 @@ class PyTextDataObject(TextDataObject):
        into the data object.
        """
        _misc_.PyTextDataObject_swiginit(self,_misc_.new_PyTextDataObject(*args, **kwargs))
-        self._setCallbackInfo(self, PyTextDataObject)
+        PyTextDataObject._setCallbackInfo(self, self, PyTextDataObject)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5117,7 +5117,7 @@ class PyBitmapDataObject(BitmapDataObject):
        data on demand derive from this class and overload `GetBitmap`.
        """
        _misc_.PyBitmapDataObject_swiginit(self,_misc_.new_PyBitmapDataObject(*args, **kwargs))
-        self._setCallbackInfo(self, PyBitmapDataObject)
+        PyBitmapDataObject._setCallbackInfo(self, self, PyBitmapDataObject)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5278,10 +5278,10 @@ class DropSource(object):
            Icon none=wxNullIcon) -> DropSource
        """
        _misc_.DropSource_swiginit(self,_misc_.new_DropSource(*args, **kwargs))
-        self._setCallbackInfo(self, DropSource, 0)
+        DropSource._setCallbackInfo(self, self, DropSource)

    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
        return _misc_.DropSource__setCallbackInfo(*args, **kwargs)

    __swig_destroy__ = _misc_.delete_DropSource
@@ -5333,7 +5333,7 @@ class DropTarget(object):
    def __init__(self, *args, **kwargs): 
        """__init__(self, DataObject dataObject=None) -> DropTarget"""
        _misc_.DropTarget_swiginit(self,_misc_.new_DropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, DropTarget)
+        DropTarget._setCallbackInfo(self, self, DropTarget)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5409,7 +5409,7 @@ class TextDropTarget(DropTarget):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> TextDropTarget"""
        _misc_.TextDropTarget_swiginit(self,_misc_.new_TextDropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, TextDropTarget)
+        TextDropTarget._setCallbackInfo(self, self, TextDropTarget)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -5478,7 +5478,7 @@ class FileDropTarget(DropTarget):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> FileDropTarget"""
        _misc_.FileDropTarget_swiginit(self,_misc_.new_FileDropTarget(*args, **kwargs))
-        self._setCallbackInfo(self, FileDropTarget)
+        FileDropTarget._setCallbackInfo(self, self, FileDropTarget)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -11540,7 +11540,7 @@ SWIGINTERN PyObject *_wrap_Timer__setCallbackInfo(PyObject *SWIGUNUSEDPARM(self)
  wxPyTimer *arg1 = (wxPyTimer *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  int arg4 = (int) 1 ;
+  int arg4 = (int) 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  int val4 ;
@@ -33783,7 +33783,7 @@ SWIGINTERN PyObject *_wrap_DropSource__setCallbackInfo(PyObject *SWIGUNUSEDPARM(
  wxPyDropSource *arg1 = (wxPyDropSource *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  int arg4 ;
+  int arg4 = (int) 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  int val4 ;
@@ -33796,7 +33796,7 @@ SWIGINTERN PyObject *_wrap_DropSource__setCallbackInfo(PyObject *SWIGUNUSEDPARM(
    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:DropSource__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyDropSource, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DropSource__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyDropSource *""'"); 
@@ -33804,11 +33804,13 @@ SWIGINTERN PyObject *_wrap_DropSource__setCallbackInfo(PyObject *SWIGUNUSEDPARM(
  arg1 = reinterpret_cast< wxPyDropSource * >(argp1);
  arg2 = obj1;
  arg3 = obj2;
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DropSource__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DropSource__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -1750,7 +1750,7 @@ class PopupTransientWindow(PopupWindow):
    def __init__(self, *args, **kwargs): 
        """__init__(self, Window parent, int style=BORDER_NONE) -> PopupTransientWindow"""
        _windows_.PopupTransientWindow_swiginit(self,_windows_.new_PopupTransientWindow(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)
+        self._setOORInfo(self);PopupTransientWindow._setCallbackInfo(self, self, PopupTransientWindow)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1811,7 +1811,7 @@ class VScrolledWindow(Panel):
            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow
        """
        _windows_.VScrolledWindow_swiginit(self,_windows_.new_VScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)
+        self._setOORInfo(self);VScrolledWindow._setCallbackInfo(self, self, VScrolledWindow)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1914,7 +1914,7 @@ class VListBox(VScrolledWindow):
            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox
        """
        _windows_.VListBox_swiginit(self,_windows_.new_VListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, VListBox)
+        self._setOORInfo(self);VListBox._setCallbackInfo(self, self, VListBox)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -2043,7 +2043,7 @@ class HtmlListBox(VListBox):
            Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox
        """
        _windows_.HtmlListBox_swiginit(self,_windows_.new_HtmlListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)
+        self._setOORInfo(self);HtmlListBox._setCallbackInfo(self, self, HtmlListBox)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -2120,12 +2120,12 @@ class TaskBarIcon(_core.EvtHandler):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> TaskBarIcon"""
        _windows_.TaskBarIcon_swiginit(self,_windows_.new_TaskBarIcon(*args, **kwargs))
-        self._setCallbackInfo(self, TaskBarIcon, 0)
+        TaskBarIcon._setCallbackInfo(self, self, TaskBarIcon)

    __swig_destroy__ = _windows_.delete_TaskBarIcon
    __del__ = lambda self : None;
    def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
        return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)

    def Destroy(*args, **kwargs):
@@ -3318,7 +3318,7 @@ class PyWindow(_core.Window):
            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow
        """
        _windows_.PyWindow_swiginit(self,_windows_.new_PyWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)
+        self._setOORInfo(self);PyWindow._setCallbackInfo(self, self, PyWindow)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -3495,7 +3495,7 @@ class PyPanel(Panel):
            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel
        """
        _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
+        self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -3672,7 +3672,7 @@ class PyScrolledWindow(ScrolledWindow):
            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow
        """
        _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)
+        self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4426,7 +4426,7 @@ class Printout(_core.Object):
    def __init__(self, *args, **kwargs): 
        """__init__(self, String title=PrintoutTitleStr) -> Printout"""
        _windows_.Printout_swiginit(self,_windows_.new_Printout(*args, **kwargs))
-        self._setCallbackInfo(self, Printout)
+        Printout._setCallbackInfo(self, self, Printout)

    __swig_destroy__ = _windows_.delete_Printout
    __del__ = lambda self : None;
@@ -4843,7 +4843,7 @@ class PyPrintPreview(PrintPreview):
        __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
        """
        _windows_.PyPrintPreview_swiginit(self,_windows_.new_PyPrintPreview(*args))
-        self._setCallbackInfo(self, PyPrintPreview)
+        PyPrintPreview._setCallbackInfo(self, self, PyPrintPreview)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4897,7 +4897,7 @@ class PyPreviewFrame(PreviewFrame):
            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame
        """
        _windows_.PyPreviewFrame_swiginit(self,_windows_.new_PyPreviewFrame(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewFrame._setCallbackInfo(self, self, PyPreviewFrame)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4951,7 +4951,7 @@ class PyPreviewControlBar(PreviewControlBar):
            long style=0, String name=PanelNameStr) -> PyPreviewControlBar
        """
        _windows_.PyPreviewControlBar_swiginit(self,_windows_.new_PyPreviewControlBar(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewControlBar._setCallbackInfo(self, self, PyPreviewControlBar)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -16319,7 +16319,7 @@ SWIGINTERN PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *SWIGUNUSEDPARM
  wxPyTaskBarIcon *arg1 = (wxPyTaskBarIcon *) 0 ;
  PyObject *arg2 = (PyObject *) 0 ;
  PyObject *arg3 = (PyObject *) 0 ;
-  int arg4 ;
+  int arg4 = (int) 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  int val4 ;
@@ -16332,7 +16332,7 @@ SWIGINTERN PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *SWIGUNUSEDPARM
    (char *) "self",(char *) "self",(char *) "_class",(char *) "incref", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:TaskBarIcon__setCallbackInfo",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyTaskBarIcon, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "1"" of type '" "wxPyTaskBarIcon *""'"); 
@@ -16340,11 +16340,13 @@ SWIGINTERN PyObject *_wrap_TaskBarIcon__setCallbackInfo(PyObject *SWIGUNUSEDPARM
  arg1 = reinterpret_cast< wxPyTaskBarIcon * >(argp1);
  arg2 = obj1;
  arg3 = obj2;
-  ecode4 = SWIG_AsVal_int(obj3, &val4);
-  if (!SWIG_IsOK(ecode4)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
-  } 
-  arg4 = static_cast< int >(val4);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_int(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "TaskBarIcon__setCallbackInfo" "', expected argument " "4"" of type '" "int""'");
+    } 
+    arg4 = static_cast< int >(val4);
+  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    (arg1)->_setCallbackInfo(arg2,arg3,arg4);
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -135,7 +135,7 @@ class PyGridCellRenderer(GridCellRenderer):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyGridCellRenderer"""
        _grid.PyGridCellRenderer_swiginit(self,_grid.new_PyGridCellRenderer(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellRenderer);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridCellRenderer._setCallbackInfo(self, self, PyGridCellRenderer)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -336,7 +336,7 @@ class PyGridCellEditor(GridCellEditor):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyGridCellEditor"""
        _grid.PyGridCellEditor_swiginit(self,_grid.new_PyGridCellEditor(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellEditor);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridCellEditor._setCallbackInfo(self, self, PyGridCellEditor)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -702,7 +702,7 @@ class PyGridCellAttrProvider(GridCellAttrProvider):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyGridCellAttrProvider"""
        _grid.PyGridCellAttrProvider_swiginit(self,_grid.new_PyGridCellAttrProvider(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridCellAttrProvider)
+        PyGridCellAttrProvider._setCallbackInfo(self, self, PyGridCellAttrProvider)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -906,7 +906,7 @@ class PyGridTableBase(GridTableBase):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> PyGridTableBase"""
        _grid.PyGridTableBase_swiginit(self,_grid.new_PyGridTableBase(*args, **kwargs))
-        self._setCallbackInfo(self, PyGridTableBase);self._setOORInfo(self)
+        self._setOORInfo(self);PyGridTableBase._setCallbackInfo(self, self, PyGridTableBase)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -391,7 +391,7 @@ class HtmlTagHandler(_core.Object):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> HtmlTagHandler"""
        _html.HtmlTagHandler_swiginit(self,_html.new_HtmlTagHandler(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlTagHandler)
+        HtmlTagHandler._setCallbackInfo(self, self, HtmlTagHandler)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -419,7 +419,7 @@ class HtmlWinTagHandler(HtmlTagHandler):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> HtmlWinTagHandler"""
        _html.HtmlWinTagHandler_swiginit(self,_html.new_HtmlWinTagHandler(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlWinTagHandler)
+        HtmlWinTagHandler._setCallbackInfo(self, self, HtmlWinTagHandler)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -920,7 +920,7 @@ class HtmlFilter(_core.Object):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> HtmlFilter"""
        _html.HtmlFilter_swiginit(self,_html.new_HtmlFilter(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlFilter)
+        HtmlFilter._setCallbackInfo(self, self, HtmlFilter)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -983,7 +983,7 @@ class HtmlWindow(_windows.ScrolledWindow):
            String name=HtmlWindowNameStr) -> HtmlWindow
        """
        _html.HtmlWindow_swiginit(self,_html.new_HtmlWindow(*args, **kwargs))
-        self._setCallbackInfo(self, HtmlWindow); self._setOORInfo(self)
+        self._setOORInfo(self);HtmlWindow._setCallbackInfo(self, self, HtmlWindow)

    def Create(*args, **kwargs):
        """
--- a/wxPython/src/gtk/wizard.py
+++ b/wxPython/src/gtk/wizard.py
@@ -127,7 +127,7 @@ class PyWizardPage(WizardPage):
    def __init__(self, *args, **kwargs): 
        """__init__(self, Wizard parent, Bitmap bitmap=&wxNullBitmap, String resource=&wxPyEmptyString) -> PyWizardPage"""
        _wizard.PyWizardPage_swiginit(self,_wizard.new_PyWizardPage(*args, **kwargs))
-        self._setCallbackInfo(self, PyWizardPage);self._setOORInfo(self)
+        self._setOORInfo(self);PyWizardPage._setCallbackInfo(self, self, PyWizardPage)

    def Create(*args, **kwargs):
        """Create(self, Wizard parent, Bitmap bitmap=wxNullBitmap, String resource=EmptyString) -> bool"""
--- a/wxPython/src/gtk/xrc.py
+++ b/wxPython/src/gtk/xrc.py
@@ -262,7 +262,7 @@ class XmlSubclassFactory(object):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> XmlSubclassFactory"""
        _xrc.XmlSubclassFactory_swiginit(self,_xrc.new_XmlSubclassFactory(*args, **kwargs))
-        self._setCallbackInfo(self, XmlSubclassFactory)
+        XmlSubclassFactory._setCallbackInfo(self, self, XmlSubclassFactory)

    def _setCallbackInfo(*args, **kwargs):
        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -535,7 +535,7 @@ class XmlResourceHandler(_core.Object):
    def __init__(self, *args, **kwargs): 
        """__init__(self) -> XmlResourceHandler"""
        _xrc.XmlResourceHandler_swiginit(self,_xrc.new_XmlResourceHandler(*args, **kwargs))
-        self._setCallbackInfo(self, XmlResourceHandler)
+        XmlResourceHandler._setCallbackInfo(self, self, XmlResourceHandler)

    __swig_destroy__ = _xrc.delete_XmlResourceHandler
    __del__ = lambda self : None;