reSWIGged

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

diff --git a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
index b0fb939d708d0e14635398c61ba2ecc97adbd3f3..909d5d9d1172dd5ae261fedca09fa50d4ae34453 100644 (file)
--- a/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
@@ -3057,6 +3057,7 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);

+                Py_DECREF(item);

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;

diff --git a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
index 29b5f615897604b3df65448d38d7be2a949c3ac3..19e54ccc8ba7b37fec0b196729b58722f57bccdf 100644 (file)
--- a/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
@@ -3057,6 +3057,7 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);

+                Py_DECREF(item);

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;

diff --git a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
index 2d780244decb3077efa2d06ddbc25256923efaa9..18b7a0fffcf40ffe10d243c58ff905611b565d8d 100644 (file)
--- a/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
+++ b/wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
@@ -3057,6 +3057,7 @@ SWIGINTERN PyObject *wxPyTreeListCtrl_GetSelections(wxPyTreeListCtrl *self){
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);
                 wxTreeItemId *tii = new wxTreeItemId(array.Item(x));
                 PyObject* item = wxPyConstructObject((void*)tii, wxT("wxTreeItemId"), true);
                 PyList_Append(rval, item);

+                Py_DECREF(item);

             }
             wxPyEndBlockThreads(blocked);
             return rval;
             }
             wxPyEndBlockThreads(blocked);
             return rval;

diff --git a/wxPython/src/_html_rename.i b/wxPython/src/_html_rename.i
index 009d91b72099c6fb80462c0b9c24f32ffd586314..7510f3f36ff7b491499eb0c9100ef563f92d5f80 100644 (file)
--- a/wxPython/src/_html_rename.i
+++ b/wxPython/src/_html_rename.i
@@ -61,6 +61,7 @@
 %rename(HtmlColourCell)                     wxHtmlColourCell;
 %rename(HtmlFontCell)                       wxHtmlFontCell;
 %rename(HtmlWidgetCell)                     wxHtmlWidgetCell;
 %rename(HtmlColourCell)                     wxHtmlColourCell;
 %rename(HtmlFontCell)                       wxHtmlFontCell;
 %rename(HtmlWidgetCell)                     wxHtmlWidgetCell;

+%rename(HtmlWindowInterface)                wxHtmlWindowInterface;

 %rename(HtmlDCRenderer)                     wxHtmlDCRenderer;
 %rename(PAGE_ODD)                           wxPAGE_ODD;
 %rename(PAGE_EVEN)                          wxPAGE_EVEN;
 %rename(HtmlDCRenderer)                     wxHtmlDCRenderer;
 %rename(PAGE_ODD)                           wxPAGE_ODD;
 %rename(PAGE_EVEN)                          wxPAGE_EVEN;

diff --git a/wxPython/src/gtk/_controls.py b/wxPython/src/gtk/_controls.py
index b301b43e8dcc67f7cd13d40efdb6f9ab3a474dcc..3137d735273d6243efb1aeb4293ffb82e23ff1f8 100644 (file)
--- a/wxPython/src/gtk/_controls.py
+++ b/wxPython/src/gtk/_controls.py
@@ -860,7 +860,7 @@ def ComboBox_GetClassDefaultAttributes(*args, **kwargs):
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH

-GA_PROGRESSBAR = _controls_.GA_PROGRESSBAR
+GA_PROGRESSBAR = 0 # obsolete 

 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -1491,9 +1491,9 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP

-TE_LINEWRAP = _controls_.TE_LINEWRAP

 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE
 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE

+TE_LINEWRAP = TE_CHARWRAP 

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE


@@ -2754,6 +2754,7 @@ BK_BOTTOM = _controls_.BK_BOTTOM
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK

+BK_BUTTONBAR = _controls_.BK_BUTTONBAR

 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -2812,17 +2813,25 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):

-        """GetInternalBorder(self) -> size_t"""
+        """GetInternalBorder(self) -> unsigned int"""

         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):

-        """SetInternalBorder(self, size_t internalBorder)"""
+        """SetInternalBorder(self, unsigned int internalBorder)"""

         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 
         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 

+    def SetControlMargin(*args, **kwargs):
+        """SetControlMargin(self, int margin)"""
+        return _controls_.BookCtrlBase_SetControlMargin(*args, **kwargs)
+
+    def GetControlMargin(*args, **kwargs):
+        """GetControlMargin(self) -> int"""
+        return _controls_.BookCtrlBase_GetControlMargin(*args, **kwargs)
+

     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)
     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)


@@ -2831,6 +2840,10 @@ class BookCtrlBase(_core.Control):
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 

+    def GetControlSizer(*args, **kwargs):
+        """GetControlSizer(self) -> Sizer"""
+        return _controls_.BookCtrlBase_GetControlSizer(*args, **kwargs)
+

     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)
     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)


@@ -3824,10 +3837,6 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 

-    def FindToolForPosition(*args, **kwargs):
-        """FindToolForPosition(self, int x, int y) -> ToolBarToolBase"""
-        return _controls_.ToolBar_FindToolForPosition(*args, **kwargs)
-

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -4399,10 +4408,12 @@ class ListCtrl(_core.Control):
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 

+    GetItemSpacing = wx._deprecated(GetItemSpacing) 

     def SetItemSpacing(*args, **kwargs):
         """SetItemSpacing(self, int spacing, bool isSmall=False)"""
         return _controls_.ListCtrl_SetItemSpacing(*args, **kwargs)
 
     def SetItemSpacing(*args, **kwargs):
         """SetItemSpacing(self, int spacing, bool isSmall=False)"""
         return _controls_.ListCtrl_SetItemSpacing(*args, **kwargs)
 

+    SetItemSpacing = wx._deprecated(SetItemSpacing) 

     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)
     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)


@@ -4759,8 +4770,10 @@ TR_ROW_LINES = _controls_.TR_ROW_LINES
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS

-TR_MAC_BUTTONS = _controls_.TR_MAC_BUTTONS
-TR_AQUA_BUTTONS = _controls_.TR_AQUA_BUTTONS
+# obsolete
+TR_MAC_BUTTONS = 0
+wxTR_AQUA_BUTTONS = 0
+

 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded
 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded


@@ -4991,7 +5004,7 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):

-        """GetCount(self) -> size_t"""
+        """GetCount(self) -> unsigned int"""

         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):
         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):

diff --git a/wxPython/src/gtk/_controls_wrap.cpp b/wxPython/src/gtk/_controls_wrap.cpp
index d4d69ae544042e01826732d1a72e1cf9773ac1a9..d36aab5736978392b0592ff9d1262d16795ae7c5 100644 (file)
--- a/wxPython/src/gtk/_controls_wrap.cpp
+++ b/wxPython/src/gtk/_controls_wrap.cpp
@@ -2807,14 +2807,15 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>

-    

 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){
 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){

-            if (clientData) {
+            if (clientData)
+            {

                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);
                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);

-            } else
+            }
+            else

                 self->Insert(item, pos);
         }
 
                 self->Insert(item, pos);
         }
 


@@ -2847,12 +2848,15 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());
             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());

-            for(size_t i=0; i<lst.GetCount(); i++) {
+            for (size_t i=0; i<lst.GetCount(); i++)
+            {

                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }
                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }

+            wxPyEndBlockThreads(blocked);

             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){
             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){


@@ -19219,7 +19223,7 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -19233,11 +19237,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPA
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxBookCtrlBase const *)arg1)->GetInternalBorder();
+    result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -19247,10 +19251,10 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t arg2 ;
+  unsigned int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  unsigned int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;


@@ -19264,11 +19268,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);

-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "size_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "unsigned int""'");

   } 
   } 

-  arg2 = static_cast< size_t >(val2);
+  arg2 = static_cast< unsigned int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);


@@ -19312,6 +19316,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_SetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "margin", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetControlMargin",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetControlMargin(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBookCtrlBase const *)arg1)->GetControlMargin();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -19380,6 +19450,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  wxSizer *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlSizer" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizer *)((wxBookCtrlBase const *)arg1)->GetControlSizer();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -25313,56 +25413,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxToolBar *arg1 = (wxToolBar *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  wxToolBarToolBase *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
-  }
-  arg1 = reinterpret_cast< wxToolBar * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, (bool)0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;


@@ -33317,7 +33367,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -33331,11 +33381,11 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxPyTreeCtrl const *)arg1)->GetCount();
+    result = (unsigned int)((wxPyTreeCtrl const *)arg1)->GetCount();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -41027,8 +41077,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},

+        { (char *)"BookCtrlBase_SetControlMargin", (PyCFunction) _wrap_BookCtrlBase_SetControlMargin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BookCtrlBase_GetControlMargin", (PyCFunction)_wrap_BookCtrlBase_GetControlMargin, METH_O, NULL},

         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},
         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},

+        { (char *)"BookCtrlBase_GetControlSizer", (PyCFunction)_wrap_BookCtrlBase_GetControlSizer, METH_O, NULL},

         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},
         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},


@@ -41181,7 +41234,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},


@@ -43832,7 +43884,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));

-  SWIG_Python_SetConstant(d, "GA_PROGRESSBAR",SWIG_From_int(static_cast< int >(wxGA_PROGRESSBAR)));

   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);


@@ -43856,7 +43907,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));

-  SWIG_Python_SetConstant(d, "TE_LINEWRAP",SWIG_From_int(static_cast< int >(wxTE_LINEWRAP)));

   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));
   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));


@@ -43920,6 +43970,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));

+  SWIG_Python_SetConstant(d, "BK_BUTTONBAR",SWIG_From_int(static_cast< int >(wxBK_BUTTONBAR)));

   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));
   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));


@@ -44077,8 +44128,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));

-  SWIG_Python_SetConstant(d, "TR_MAC_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_MAC_BUTTONS)));
-  SWIG_Python_SetConstant(d, "TR_AQUA_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_AQUA_BUTTONS)));

   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));

diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py
index 26162f84fda98bc6b8e1c4fc28c635daf579b599..8fe054836803ccdd462aad2bc0b7d42ecbe85f18 100644 (file)
--- a/wxPython/src/gtk/_core.py
+++ b/wxPython/src/gtk/_core.py
@@ -133,6 +133,8 @@ SB_VERTICAL = _core_.SB_VERTICAL
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE

+ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE
+ST_DOTS_END = _core_.ST_DOTS_END

 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE
 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE


@@ -804,7 +806,7 @@ class Size(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Size sz) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Size objects.
         """
 
         Test for equality of wx.Size objects.
         """


@@ -812,9 +814,9 @@ class Size(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Size sz) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Size objects.

         """
         return _core_.Size___ne__(*args, **kwargs)
 
         """
         return _core_.Size___ne__(*args, **kwargs)
 


@@ -940,7 +942,7 @@ class RealPoint(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, RealPoint pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.RealPoint objects.
         """
 
         Test for equality of wx.RealPoint objects.
         """


@@ -948,7 +950,7 @@ class RealPoint(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, RealPoint pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.RealPoint objects.
         """
 
         Test for inequality of wx.RealPoint objects.
         """


@@ -1025,7 +1027,7 @@ class Point(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Point objects.
         """
 
         Test for equality of wx.Point objects.
         """


@@ -1033,7 +1035,7 @@ class Point(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.Point objects.
         """
 
         Test for inequality of wx.Point objects.
         """


@@ -1316,17 +1318,17 @@ class Rect(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Rect rect) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality.
+        Test for equality of wx.Rect objects.

         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Rect rect) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Rect objects.

         """
         return _core_.Rect___ne__(*args, **kwargs)
 
         """
         return _core_.Rect___ne__(*args, **kwargs)
 


@@ -1533,17 +1535,17 @@ class Point2D(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point2D pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality
+        Test for equality of wx.Point2D objects.

         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point2D pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality
+        Test for inequality of wx.Point2D objects.

         """
         return _core_.Point2D___ne__(*args, **kwargs)
 
         """
         return _core_.Point2D___ne__(*args, **kwargs)
 


@@ -11937,11 +11939,19 @@ class GBPosition(object):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBPosition other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare GBPosition for equality.
+        """

         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBPosition other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBPosition for inequality.
+        """

         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -12010,11 +12020,19 @@ class GBSpan(object):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBSpan other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare wxGBSpan for equality.
+        """

         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBSpan other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBSpan for inequality.
+        """

         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):

diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp
index b69e671a0ed59a1e1bc4d949803699a2b5a676bd..46457d15a70d2fc42eaf5eeb3e1d21fcc5b38e29 100644 (file)
--- a/wxPython/src/gtk/_core_wrap.cpp
+++ b/wxPython/src/gtk/_core_wrap.cpp
@@ -2953,6 +2953,24 @@ SWIG_AsVal_int (PyObject * obj, int *val)
   return res;
 }
 
   return res;
 }
 

+SWIGINTERN bool wxSize___eq__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxSize_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxSize___ne__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxSize_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);


@@ -2975,6 +2993,24 @@ SWIG_AsVal_double (PyObject *obj, double* val)
 
   #define SWIG_From_double   PyFloat_FromDouble 
 
 
   #define SWIG_From_double   PyFloat_FromDouble 
 

+SWIGINTERN bool wxRealPoint___eq__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRealPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRealPoint___ne__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRealPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;


@@ -2987,6 +3023,24 @@ SWIGINTERN PyObject *wxRealPoint_Get(wxRealPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxPoint___eq__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint___ne__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;


@@ -2999,6 +3053,24 @@ SWIGINTERN PyObject *wxPoint_Get(wxPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxRect___eq__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRect_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRect___ne__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRect_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;


@@ -3036,6 +3108,24 @@ SWIGINTERN PyObject *wxRect_Get(wxRect *self){
         return Py_None;
     }
 
         return Py_None;
     }
 

+SWIGINTERN bool wxPoint2D___eq__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint2D_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint2D___ne__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint2D_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;
 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;


@@ -4150,6 +4240,24 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj)
 }
 
 
 }
 
 

+SWIGINTERN bool wxGBPosition___eq__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBPosition_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBPosition___ne__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBPosition_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);
 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);


@@ -4162,6 +4270,24 @@ SWIGINTERN PyObject *wxGBPosition_Get(wxGBPosition *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxGBSpan___eq__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBSpan_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBSpan___ne__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBSpan_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);
 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);


@@ -4500,15 +4626,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4517,14 +4642,9 @@ SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -4539,15 +4659,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4556,14 +4675,9 @@ SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5185,15 +5299,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5202,14 +5315,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5224,15 +5332,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5241,14 +5348,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5600,15 +5702,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5617,14 +5718,9 @@ SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5639,15 +5735,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5656,14 +5751,9 @@ SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7259,31 +7349,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator ==((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7298,31 +7382,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator !=((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8538,31 +8616,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator ==((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8577,31 +8649,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator !=((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48667,11 +48733,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48684,14 +48749,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48706,11 +48766,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48723,14 +48782,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49038,11 +49092,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49055,14 +49108,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49077,11 +49125,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49094,14 +49141,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -55401,6 +55443,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));

+  SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE)));
+  SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END)));

   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));
   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index ddee135fe8897d31edc01cb08d2375ad1531240d..c16a681ea8b56c461db4dd874f36077edcd40779 100644 (file)
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -188,17 +188,17 @@ class Colour(_core.Object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Colour colour) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Compare colours for equality
+        Compare colours for equality.

         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Colour colour) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Compare colours for inequality
+        Compare colours for inequality.

         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 
         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 

diff --git a/wxPython/src/gtk/_gdi_wrap.cpp b/wxPython/src/gtk/_gdi_wrap.cpp
index 513d1490b64ab7c0116dc5ca167bd77d54f5322c..f797420e8642de72f31c30a12246345723517639 100644 (file)
--- a/wxPython/src/gtk/_gdi_wrap.cpp
+++ b/wxPython/src/gtk/_gdi_wrap.cpp
@@ -2786,6 +2786,24 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
   return SWIG_From_unsigned_SS_long  (value);
 }
 
   return SWIG_From_unsigned_SS_long  (value);
 }
 

+SWIGINTERN bool wxColour___eq__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxColour_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxColour___ne__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxColour_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;
 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;


@@ -3056,18 +3074,26 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetEncodings();
             wxArrayString* arr = self->GetEncodings();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret = PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetFacenames();
             wxArrayString* arr = self->GetFacenames();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret =  PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
 #include <locale.h>
         }
 
 #include <locale.h>


@@ -3819,31 +3845,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator ==((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -3858,31 +3878,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator !=((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

diff --git a/wxPython/src/gtk/_misc.py b/wxPython/src/gtk/_misc.py
index bed324eca3de7282d9ca1c66810bb0df66e80498..8f3d0c9d2e6b84e07794466b84b58ac37c1dad5e 100644 (file)
--- a/wxPython/src/gtk/_misc.py
+++ b/wxPython/src/gtk/_misc.py
@@ -313,6 +313,7 @@ def EndBusyCursor(*args):
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)

+GetElapsedTime = wx._deprecated(GetElapsedTime) 

 
 def IsBusy(*args):
   """IsBusy() -> bool"""
 
 def IsBusy(*args):
   """IsBusy() -> bool"""


@@ -3834,6 +3835,16 @@ class TimeSpan(object):
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr

+    def Milliseconds(*args, **kwargs):
+        """Milliseconds(long ms) -> TimeSpan"""
+        return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+    Milliseconds = staticmethod(Milliseconds)
+    def Millisecond(*args, **kwargs):
+        """Millisecond() -> TimeSpan"""
+        return _misc_.TimeSpan_Millisecond(*args, **kwargs)
+
+    Millisecond = staticmethod(Millisecond)

     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)
     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4026,6 +4037,14 @@ class TimeSpan(object):
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 

+def TimeSpan_Milliseconds(*args, **kwargs):
+  """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
+  return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+def TimeSpan_Millisecond(*args):
+  """TimeSpan_Millisecond() -> TimeSpan"""
+  return _misc_.TimeSpan_Millisecond(*args)
+

 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)
 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4595,6 +4614,17 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 

+    def GetReceivedFormat(*args, **kwargs):
+        """
+        GetReceivedFormat(self) -> DataFormat
+
+        Report the format passed to the `SetData` method.  This should be the
+        format of the data object within the composite that recieved data from
+        the clipboard or the DnD operation.  You can use this method to find
+        out what kind of data object was recieved.
+        """
+        return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
+

 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 
 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 


@@ -5616,14 +5646,13 @@ def Display_GetFromWindow(*args, **kwargs):
 
 class StandardPaths(object):
     """
 
 class StandardPaths(object):
     """

-    wx.StandardPaths returns the standard locations in the file system and
-    should be used by the programs to find their data files in a portable
-    way.
+    wx.StandardPaths returns standard locations in the file system and
+    should be used by programs to find their data files in a portable way.

 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note
 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note

-    that these are just the examples and the actual values may differ. For
-    example, under Windows: the system administrator may change the
+    that these are just  examples and the actual values may differ. For
+    example, under Windows the system administrator may change the

     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 
     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 


@@ -5634,7 +5663,7 @@ class StandardPaths(object):
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,

-    wxStandardPaths doesn't do it.
+    wx.StandardPaths doesn't do it.

 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard
 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard


@@ -5645,6 +5674,9 @@ class StandardPaths(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    ResourceCat_None = _misc_.StandardPaths_ResourceCat_None
+    ResourceCat_Messages = _misc_.StandardPaths_ResourceCat_Messages
+    ResourceCat_Max = _misc_.StandardPaths_ResourceCat_Max

     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths
     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths


@@ -5731,6 +5763,32 @@ class StandardPaths(object):
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 

+    def GetResourcesDir(*args, **kwargs):
+        """
+        GetResourcesDir(self) -> String
+
+        Get resources directory.  Resources are auxiliary files used by the
+        application and include things like image and sound files.
+
+        Same as `GetDataDir` for all platforms except Mac where it returns
+        Contents/Resources subdirectory of the app bundle.
+        """
+        return _misc_.StandardPaths_GetResourcesDir(*args, **kwargs)
+
+    def GetLocalizedResourcesDir(*args, **kwargs):
+        """
+        GetLocalizedResourcesDir(self, String lang, int category=ResourceCat_None) -> String
+
+        Get localized resources directory containing the resource files of the
+        specified category for the given language.
+
+        In general this is just GetResourcesDir()/lang under Windows and Unix
+        and GetResourcesDir()/lang.lproj under Mac but is something quite
+        different under Unix for the message catalog category (namely the
+        standard prefix/share/locale/lang/LC_MESSAGES.)
+        """
+        return _misc_.StandardPaths_GetLocalizedResourcesDir(*args, **kwargs)
+

     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)
     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)

diff --git a/wxPython/src/gtk/_misc_wrap.cpp b/wxPython/src/gtk/_misc_wrap.cpp
index 79db48f5646d26995e434b1fea747e543c0dacb5..9dbff051af60f9bcf8908280011d16b0e02d73a5 100644 (file)
--- a/wxPython/src/gtk/_misc_wrap.cpp
+++ b/wxPython/src/gtk/_misc_wrap.cpp
@@ -3537,12 +3537,14 @@ SWIGINTERN void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; }
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {

+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }

+        wxPyEndBlockThreads(blocked);

         return ret;
     }
 
         return ret;
     }
 


@@ -27298,6 +27300,54 @@ SWIGINTERN PyObject *DateTime_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_TimeSpan_Milliseconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  long arg1 ;
+  wxTimeSpan result;
+  long val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ms", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Milliseconds",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_long(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "TimeSpan_Milliseconds" "', expected argument " "1"" of type '" "long""'");
+  } 
+  arg1 = static_cast< long >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Milliseconds(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TimeSpan_Millisecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxTimeSpan result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"TimeSpan_Millisecond",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Millisecond();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;
 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;


@@ -31312,6 +31362,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DataObjectComposite_GetReceivedFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ;
+  SwigValueWrapper<wxDataFormat > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataObjectComposite, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataObjectComposite_GetReceivedFormat" "', expected argument " "1"" of type '" "wxDataObjectComposite const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDataObjectComposite * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDataObjectComposite const *)arg1)->GetReceivedFormat();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxDataFormat(static_cast< const wxDataFormat& >(result))), SWIGTYPE_p_wxDataFormat, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -35630,6 +35708,103 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_StandardPaths_GetResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetResourcesDir();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StandardPaths_GetLocalizedResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString *arg2 = 0 ;
+  wxStandardPaths::ResourceCat arg3 = (wxStandardPaths::ResourceCat) wxStandardPaths::ResourceCat_None ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "lang",(char *) "category", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StandardPaths_GetLocalizedResourcesDir",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "3"" of type '" "wxStandardPaths::ResourceCat""'");
+    } 
+    arg3 = static_cast< wxStandardPaths::ResourceCat >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetLocalizedResourcesDir((wxString const &)*arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;


@@ -36353,6 +36528,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},

+        { (char *)"TimeSpan_Milliseconds", (PyCFunction) _wrap_TimeSpan_Milliseconds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TimeSpan_Millisecond", (PyCFunction)_wrap_TimeSpan_Millisecond, METH_NOARGS, NULL},

         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36472,6 +36649,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DataObjectComposite_GetReceivedFormat", (PyCFunction)_wrap_DataObjectComposite_GetReceivedFormat, METH_O, NULL},

         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36620,6 +36798,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},

+        { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL},
+        { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},
         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},


@@ -38774,5 +38954,8 @@ SWIGEXPORT void SWIG_init(void) {
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);

+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_None",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_None)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Messages",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Messages)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Max",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Max)));

 }
 
 }
 

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index 26b0fe466b4df9e71b0185b02aa5dd34e41a5b5b..c11afc64853f458936454fa74eb059ac05afdb65 100644 (file)
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -1957,6 +1957,10 @@ class HtmlListBox(VListBox):
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 

+    def OnLinkClicked(*args, **kwargs):
+        """OnLinkClicked(self, size_t n, wxHtmlLinkInfo link)"""
+        return _windows_.HtmlListBox_OnLinkClicked(*args, **kwargs)
+

 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 
 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 

diff --git a/wxPython/src/gtk/_windows_wrap.cpp b/wxPython/src/gtk/_windows_wrap.cpp
index 3df5d585d140635430bb7673211395fcf379c879..4e7de3dece0685ab068d6be00da6b0ed5ed2e03d 100644 (file)
--- a/wxPython/src/gtk/_windows_wrap.cpp
+++ b/wxPython/src/gtk/_windows_wrap.cpp
@@ -2509,118 +2509,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]

-#define SWIGTYPE_p_wxICOHandler swig_types[50]
-#define SWIGTYPE_p_wxIcon swig_types[51]
-#define SWIGTYPE_p_wxIconBundle swig_types[52]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[53]
-#define SWIGTYPE_p_wxIdleEvent swig_types[54]
-#define SWIGTYPE_p_wxImage swig_types[55]
-#define SWIGTYPE_p_wxImageHandler swig_types[56]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[57]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[58]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[59]
-#define SWIGTYPE_p_wxKeyEvent swig_types[60]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[61]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[62]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[63]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[64]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[65]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[66]
-#define SWIGTYPE_p_wxMenu swig_types[67]
-#define SWIGTYPE_p_wxMenuBar swig_types[68]
-#define SWIGTYPE_p_wxMenuEvent swig_types[69]
-#define SWIGTYPE_p_wxMenuItem swig_types[70]
-#define SWIGTYPE_p_wxMessageDialog swig_types[71]
-#define SWIGTYPE_p_wxMiniFrame swig_types[72]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[73]
-#define SWIGTYPE_p_wxMouseEvent swig_types[74]
-#define SWIGTYPE_p_wxMoveEvent swig_types[75]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[76]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[77]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[78]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[79]
-#define SWIGTYPE_p_wxObject swig_types[80]
-#define SWIGTYPE_p_wxPCXHandler swig_types[81]
-#define SWIGTYPE_p_wxPNGHandler swig_types[82]
-#define SWIGTYPE_p_wxPNMHandler swig_types[83]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[84]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85]
-#define SWIGTYPE_p_wxPaintEvent swig_types[86]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[87]
-#define SWIGTYPE_p_wxPanel swig_types[88]
-#define SWIGTYPE_p_wxPaperSize swig_types[89]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[90]
-#define SWIGTYPE_p_wxPoint swig_types[91]
-#define SWIGTYPE_p_wxPopupWindow swig_types[92]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[93]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[94]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[95]
-#define SWIGTYPE_p_wxPrintData swig_types[96]
-#define SWIGTYPE_p_wxPrintDialog swig_types[97]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[98]
-#define SWIGTYPE_p_wxPrintPreview swig_types[99]
-#define SWIGTYPE_p_wxPrinter swig_types[100]
-#define SWIGTYPE_p_wxProgressDialog swig_types[101]
-#define SWIGTYPE_p_wxPyApp swig_types[102]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[103]
-#define SWIGTYPE_p_wxPyEvent swig_types[104]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[105]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[106]
-#define SWIGTYPE_p_wxPyPanel swig_types[107]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[108]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[109]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[110]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[111]
-#define SWIGTYPE_p_wxPyPrintout swig_types[112]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[113]
-#define SWIGTYPE_p_wxPySizer swig_types[114]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[115]
-#define SWIGTYPE_p_wxPyVListBox swig_types[116]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[117]
-#define SWIGTYPE_p_wxPyValidator swig_types[118]
-#define SWIGTYPE_p_wxPyWindow swig_types[119]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[120]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[121]
-#define SWIGTYPE_p_wxRect swig_types[122]
-#define SWIGTYPE_p_wxRegion swig_types[123]
-#define SWIGTYPE_p_wxSashEvent swig_types[124]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[125]
-#define SWIGTYPE_p_wxSashWindow swig_types[126]
-#define SWIGTYPE_p_wxScrollEvent swig_types[127]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[128]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[129]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[130]
-#define SWIGTYPE_p_wxShowEvent swig_types[131]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[132]
-#define SWIGTYPE_p_wxSize swig_types[133]
-#define SWIGTYPE_p_wxSizeEvent swig_types[134]
-#define SWIGTYPE_p_wxSizer swig_types[135]
-#define SWIGTYPE_p_wxSizerItem swig_types[136]
-#define SWIGTYPE_p_wxSplashScreen swig_types[137]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[138]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[139]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[140]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[141]
-#define SWIGTYPE_p_wxStatusBar swig_types[142]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[143]
-#define SWIGTYPE_p_wxString swig_types[144]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[145]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[146]
-#define SWIGTYPE_p_wxTaskBarIcon swig_types[147]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[148]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[149]
-#define SWIGTYPE_p_wxTipWindow swig_types[150]
-#define SWIGTYPE_p_wxToolBar swig_types[151]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[152]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[153]
-#define SWIGTYPE_p_wxValidator swig_types[154]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[155]
-#define SWIGTYPE_p_wxWindow swig_types[156]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[157]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[158]
-#define SWIGTYPE_p_wxXPMHandler swig_types[159]
-static swig_type_info *swig_types[161];
-static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[50]
+#define SWIGTYPE_p_wxICOHandler swig_types[51]
+#define SWIGTYPE_p_wxIcon swig_types[52]
+#define SWIGTYPE_p_wxIconBundle swig_types[53]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[54]
+#define SWIGTYPE_p_wxIdleEvent swig_types[55]
+#define SWIGTYPE_p_wxImage swig_types[56]
+#define SWIGTYPE_p_wxImageHandler swig_types[57]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[58]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[59]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[60]
+#define SWIGTYPE_p_wxKeyEvent swig_types[61]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[62]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[63]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[64]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[65]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[66]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[67]
+#define SWIGTYPE_p_wxMenu swig_types[68]
+#define SWIGTYPE_p_wxMenuBar swig_types[69]
+#define SWIGTYPE_p_wxMenuEvent swig_types[70]
+#define SWIGTYPE_p_wxMenuItem swig_types[71]
+#define SWIGTYPE_p_wxMessageDialog swig_types[72]
+#define SWIGTYPE_p_wxMiniFrame swig_types[73]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[74]
+#define SWIGTYPE_p_wxMouseEvent swig_types[75]
+#define SWIGTYPE_p_wxMoveEvent swig_types[76]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[77]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[78]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[79]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[80]
+#define SWIGTYPE_p_wxObject swig_types[81]
+#define SWIGTYPE_p_wxPCXHandler swig_types[82]
+#define SWIGTYPE_p_wxPNGHandler swig_types[83]
+#define SWIGTYPE_p_wxPNMHandler swig_types[84]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[85]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[86]
+#define SWIGTYPE_p_wxPaintEvent swig_types[87]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[88]
+#define SWIGTYPE_p_wxPanel swig_types[89]
+#define SWIGTYPE_p_wxPaperSize swig_types[90]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[91]
+#define SWIGTYPE_p_wxPoint swig_types[92]
+#define SWIGTYPE_p_wxPopupWindow swig_types[93]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[94]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[95]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[96]
+#define SWIGTYPE_p_wxPrintData swig_types[97]
+#define SWIGTYPE_p_wxPrintDialog swig_types[98]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[99]
+#define SWIGTYPE_p_wxPrintPreview swig_types[100]
+#define SWIGTYPE_p_wxPrinter swig_types[101]
+#define SWIGTYPE_p_wxProgressDialog swig_types[102]
+#define SWIGTYPE_p_wxPyApp swig_types[103]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[104]
+#define SWIGTYPE_p_wxPyEvent swig_types[105]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[106]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[107]
+#define SWIGTYPE_p_wxPyPanel swig_types[108]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[109]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[110]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[111]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[112]
+#define SWIGTYPE_p_wxPyPrintout swig_types[113]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[114]
+#define SWIGTYPE_p_wxPySizer swig_types[115]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[116]
+#define SWIGTYPE_p_wxPyVListBox swig_types[117]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[118]
+#define SWIGTYPE_p_wxPyValidator swig_types[119]
+#define SWIGTYPE_p_wxPyWindow swig_types[120]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[121]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[122]
+#define SWIGTYPE_p_wxRect swig_types[123]
+#define SWIGTYPE_p_wxRegion swig_types[124]
+#define SWIGTYPE_p_wxSashEvent swig_types[125]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[126]
+#define SWIGTYPE_p_wxSashWindow swig_types[127]
+#define SWIGTYPE_p_wxScrollEvent swig_types[128]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[129]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[130]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[131]
+#define SWIGTYPE_p_wxShowEvent swig_types[132]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[133]
+#define SWIGTYPE_p_wxSize swig_types[134]
+#define SWIGTYPE_p_wxSizeEvent swig_types[135]
+#define SWIGTYPE_p_wxSizer swig_types[136]
+#define SWIGTYPE_p_wxSizerItem swig_types[137]
+#define SWIGTYPE_p_wxSplashScreen swig_types[138]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[139]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[140]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[141]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[142]
+#define SWIGTYPE_p_wxStatusBar swig_types[143]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[144]
+#define SWIGTYPE_p_wxString swig_types[145]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[146]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[147]
+#define SWIGTYPE_p_wxTaskBarIcon swig_types[148]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[149]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[150]
+#define SWIGTYPE_p_wxTipWindow swig_types[151]
+#define SWIGTYPE_p_wxToolBar swig_types[152]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[153]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[154]
+#define SWIGTYPE_p_wxValidator swig_types[155]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[156]
+#define SWIGTYPE_p_wxWindow swig_types[157]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[158]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[159]
+#define SWIGTYPE_p_wxXPMHandler swig_types[160]
+static swig_type_info *swig_types[162];
+static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3098,6 +3099,11 @@ public:
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 

+    
+    // This method may be overriden to handle clicking on a link in
+    // the listbox. By default, clicking links is ignored.
+    virtual void OnLinkClicked(size_t n,
+                               const wxHtmlLinkInfo& link);        

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3111,6 +3117,21 @@ IMP_PYCALLBACK__DCRECTSIZET2_const   (wxPyHtmlListBox, wxHtmlListBox, OnDrawSepa
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 

+void wxPyHtmlListBox::OnLinkClicked(size_t n,
+                                    const wxHtmlLinkInfo& link) {
+    bool found;
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
+        PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", n, obj));
+        Py_DECREF(obj);
+    }
+    wxPyEndBlockThreads(blocked);
+    if (! found)
+        wxPyHtmlListBox::OnLinkClicked(n, link);
+}
+ 
+

 
 
 
 
 
 


@@ -15592,6 +15613,56 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlListBox_OnLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
+  size_t arg2 ;
+  wxHtmlLinkInfo *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "n",(char *) "link", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlListBox_OnLinkClicked",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlListBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "1"" of type '" "wxPyHtmlListBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlListBox * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxHtmlLinkInfo * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->OnLinkClicked(arg2,(wxHtmlLinkInfo const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -30763,6 +30834,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},

+        { (char *)"HtmlListBox_OnLinkClicked", (PyCFunction) _wrap_HtmlListBox_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},


@@ -32286,6 +32358,7 @@ static swig_type_info _swigt__p_wxFont = {"_p_wxFont", "wxFont *", 0, 0, (void*)
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};


@@ -32432,6 +32505,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,

+  &_swigt__p_wxHtmlLinkInfo,

   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,


@@ -32610,6 +32684,7 @@ static swig_cast_info _swigc__p_wxFont[] = {  {&_swigt__p_wxFont, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};


@@ -32756,6 +32831,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,

+  _swigc__p_wxHtmlLinkInfo,

   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,

diff --git a/wxPython/src/gtk/grid.py b/wxPython/src/gtk/grid.py
index 73fd329aaa65d47cdb6d6d5b47ff6a2f39124d7f..4cb321f50a32b5373c2a1eeaada232c728996ad8 100644 (file)
--- a/wxPython/src/gtk/grid.py
+++ b/wxPython/src/gtk/grid.py
@@ -736,6 +736,8 @@ class GridTableBase(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    __swig_destroy__ = _grid.delete_GridTableBase
+    __del__ = lambda self : None;

     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)
     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)


@@ -1094,11 +1096,19 @@ class GridCellCoords(object):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GridCellCoords other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Test for equality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GridCellCoords other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Test for inequality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):
         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):


@@ -2027,6 +2037,10 @@ class GridEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridEvent_CmdDown(*args, **kwargs)
+

 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 
 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 


@@ -2065,6 +2079,10 @@ class GridSizeEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridSizeEvent_CmdDown(*args, **kwargs)
+

 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 
 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 


@@ -2124,6 +2142,10 @@ class GridRangeSelectEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs)
+

 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 
 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 

diff --git a/wxPython/src/gtk/grid_wrap.cpp b/wxPython/src/gtk/grid_wrap.cpp
index 5b1d069fe24624b57b5e6970614a30f412a433fd..85afa780b32d89f06422e4a9ca3984b5cae9a357 100644 (file)
--- a/wxPython/src/gtk/grid_wrap.cpp
+++ b/wxPython/src/gtk/grid_wrap.cpp
@@ -3737,6 +3737,24 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)
     return list;
 }
 
     return list;
 }
 

+SWIGINTERN bool wxGridCellCoords___eq__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGridCellCoords_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGridCellCoords___ne__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGridCellCoords_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));


@@ -7625,6 +7643,34 @@ SWIGINTERN PyObject *PyGridCellAttrProvider_swiginit(PyObject *SWIGUNUSEDPARM(se
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_GridTableBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GridTableBase" "', expected argument " "1"" of type '" "wxGridTableBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridTableBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;


@@ -10053,11 +10099,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10067,17 +10112,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator ==((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10092,11 +10132,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10106,17 +10145,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator !=((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10646,7 +10680,6 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;

   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;


@@ -10666,11 +10699,10 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGridTableBase, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'");

   }
   }

-  arg2 = reinterpret_cast< wxGridTableBase * >(argp2);

   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {


@@ -18842,6 +18874,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridEvent *arg1 = (wxGridEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19154,6 +19216,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridSizeEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridSizeEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridSizeEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridSizeEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridSizeEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19600,6 +19692,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridRangeSelectEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridRangeSelectEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridRangeSelectEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridRangeSelectEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridRangeSelectEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -20039,6 +20161,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_GridTableBase", (PyCFunction)_wrap_delete_GridTableBase, METH_O, NULL},

         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},
         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},


@@ -20319,6 +20442,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},

+        { (char *)"GridEvent_CmdDown", (PyCFunction)_wrap_GridEvent_CmdDown, METH_O, NULL},

         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20328,6 +20452,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},

+        { (char *)"GridSizeEvent_CmdDown", (PyCFunction)_wrap_GridSizeEvent_CmdDown, METH_O, NULL},

         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20342,6 +20467,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},

+        { (char *)"GridRangeSelectEvent_CmdDown", (PyCFunction)_wrap_GridRangeSelectEvent_CmdDown, METH_O, NULL},

         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py
index ac71f5126c443b7d0aee754332761282d37c4972..f2c18521a362ebb12409a6736063a4e21f6c04b6 100644 (file)
--- a/wxPython/src/gtk/html.py
+++ b/wxPython/src/gtk/html.py
@@ -224,6 +224,10 @@ class HtmlParser(_core.Object):
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 

+    def GetInnerSource(*args, **kwargs):
+        """GetInnerSource(self, HtmlTag tag) -> String"""
+        return _html.HtmlParser_GetInnerSource(*args, **kwargs)
+

 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 
 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 


@@ -254,6 +258,11 @@ class HtmlWinParser(HtmlParser):
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 

+    GetWindow = wx._deprecated(GetWindow) 
+    def GetWindowInterface(*args, **kwargs):
+        """GetWindowInterface(self) -> HtmlWindowInterface"""
+        return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
+

     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)


@@ -639,10 +648,15 @@ class HtmlCell(_core.Object):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 

+    def GetMouseCursor(*args, **kwargs):
+        """GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
+        return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
+

     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 

+    GetCursor = wx._deprecated(GetCursor) 

     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)


@@ -679,6 +693,10 @@ class HtmlCell(_core.Object):
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 

+    def ProcessMouseClick(*args, **kwargs):
+        """ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
+        return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
+

     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)


@@ -700,9 +718,13 @@ class HtmlCell(_core.Object):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):

-        """GetAbsPos(self) -> Point"""
+        """GetAbsPos(self, HtmlCell rootCell=None) -> Point"""

         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 
         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 

+    def GetRootCell(*args, **kwargs):
+        """GetRootCell(self) -> HtmlCell"""
+        return _html.HtmlCell_GetRootCell(*args, **kwargs)
+

     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)


@@ -870,6 +892,47 @@ class HtmlFilter(_core.Object):
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 

+class HtmlWindowInterface(object):
+    """Proxy of C++ HtmlWindowInterface class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _html.delete_HtmlWindowInterface
+    __del__ = lambda self : None;
+    def SetHTMLWindowTitle(*args, **kwargs):
+        """SetHTMLWindowTitle(self, String title)"""
+        return _html.HtmlWindowInterface_SetHTMLWindowTitle(*args, **kwargs)
+
+    def HTMLCoordsToWindow(*args, **kwargs):
+        """HTMLCoordsToWindow(self, HtmlCell cell, Point pos) -> Point"""
+        return _html.HtmlWindowInterface_HTMLCoordsToWindow(*args, **kwargs)
+
+    def GetHTMLWindow(*args, **kwargs):
+        """GetHTMLWindow(self) -> Window"""
+        return _html.HtmlWindowInterface_GetHTMLWindow(*args, **kwargs)
+
+    def GetHTMLBackgroundColour(*args, **kwargs):
+        """GetHTMLBackgroundColour(self) -> Colour"""
+        return _html.HtmlWindowInterface_GetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundColour(*args, **kwargs):
+        """SetHTMLBackgroundColour(self, Colour clr)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundImage(*args, **kwargs):
+        """SetHTMLBackgroundImage(self, Bitmap bmpBg)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundImage(*args, **kwargs)
+
+    def SetHTMLStatusText(*args, **kwargs):
+        """SetHTMLStatusText(self, String text)"""
+        return _html.HtmlWindowInterface_SetHTMLStatusText(*args, **kwargs)
+
+    HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text
+HtmlWindowInterface_swigregister = _html.HtmlWindowInterface_swigregister
+HtmlWindowInterface_swigregister(HtmlWindowInterface)
+

 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):


@@ -1035,9 +1098,13 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):

-        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
+        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event) -> bool"""

         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 
         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 

+    def OnOpeningURL(*args, **kwargs):
+        """OnOpeningURL(self, int type, String url, String redirect) -> int"""
+        return _html.HtmlWindow_OnOpeningURL(*args, **kwargs)
+

     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,
     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,


@@ -1076,6 +1143,14 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    HTMLCursor_Default = _html.HtmlWindow_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindow_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindow_HTMLCursor_Text
+    def GetDefaultHTMLCursor(*args, **kwargs):
+        """GetDefaultHTMLCursor(int type) -> Cursor"""
+        return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+
+    GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor)

 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 
 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 


@@ -1105,6 +1180,10 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 

+def HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs):
+  """HtmlWindow_GetDefaultHTMLCursor(int type) -> Cursor"""
+  return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):


@@ -1599,7 +1678,7 @@ class HtmlHelpFrame(_windows.Frame):
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)

-         
+

     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):
     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):

diff --git a/wxPython/src/gtk/html_wrap.cpp b/wxPython/src/gtk/html_wrap.cpp
index ddbcea229165b90bacf596bd674ae07649896ffa..9b90cb6fa07e256b5ef2729c480e1ca3afadd55e 100644 (file)
--- a/wxPython/src/gtk/html_wrap.cpp
+++ b/wxPython/src/gtk/html_wrap.cpp
@@ -2544,118 +2544,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]

-#define SWIGTYPE_p_wxHtmlWordCell swig_types[85]
-#define SWIGTYPE_p_wxICOHandler swig_types[86]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[87]
-#define SWIGTYPE_p_wxIdleEvent swig_types[88]
-#define SWIGTYPE_p_wxImage swig_types[89]
-#define SWIGTYPE_p_wxImageHandler swig_types[90]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[91]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[92]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[93]
-#define SWIGTYPE_p_wxKeyEvent swig_types[94]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[95]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[96]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[97]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[98]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[99]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[100]
-#define SWIGTYPE_p_wxMenu swig_types[101]
-#define SWIGTYPE_p_wxMenuBar swig_types[102]
-#define SWIGTYPE_p_wxMenuEvent swig_types[103]
-#define SWIGTYPE_p_wxMenuItem swig_types[104]
-#define SWIGTYPE_p_wxMessageDialog swig_types[105]
-#define SWIGTYPE_p_wxMiniFrame swig_types[106]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[107]
-#define SWIGTYPE_p_wxMouseEvent swig_types[108]
-#define SWIGTYPE_p_wxMoveEvent swig_types[109]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[110]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[111]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[112]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[113]
-#define SWIGTYPE_p_wxObject swig_types[114]
-#define SWIGTYPE_p_wxPCXHandler swig_types[115]
-#define SWIGTYPE_p_wxPNGHandler swig_types[116]
-#define SWIGTYPE_p_wxPNMHandler swig_types[117]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[118]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[119]
-#define SWIGTYPE_p_wxPaintEvent swig_types[120]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[121]
-#define SWIGTYPE_p_wxPanel swig_types[122]
-#define SWIGTYPE_p_wxPaperSize swig_types[123]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[124]
-#define SWIGTYPE_p_wxPoint swig_types[125]
-#define SWIGTYPE_p_wxPopupWindow swig_types[126]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[127]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[128]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[129]
-#define SWIGTYPE_p_wxPrintData swig_types[130]
-#define SWIGTYPE_p_wxPrintDialog swig_types[131]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[132]
-#define SWIGTYPE_p_wxPrintPreview swig_types[133]
-#define SWIGTYPE_p_wxPrinter swig_types[134]
-#define SWIGTYPE_p_wxProgressDialog swig_types[135]
-#define SWIGTYPE_p_wxPyApp swig_types[136]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[137]
-#define SWIGTYPE_p_wxPyEvent swig_types[138]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[139]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[140]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[141]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[142]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[143]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[144]
-#define SWIGTYPE_p_wxPyPanel swig_types[145]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[146]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[147]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[148]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[149]
-#define SWIGTYPE_p_wxPyPrintout swig_types[150]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[151]
-#define SWIGTYPE_p_wxPySizer swig_types[152]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[153]
-#define SWIGTYPE_p_wxPyVListBox swig_types[154]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[155]
-#define SWIGTYPE_p_wxPyValidator swig_types[156]
-#define SWIGTYPE_p_wxPyWindow swig_types[157]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[158]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[159]
-#define SWIGTYPE_p_wxSashEvent swig_types[160]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[161]
-#define SWIGTYPE_p_wxSashWindow swig_types[162]
-#define SWIGTYPE_p_wxScrollEvent swig_types[163]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[164]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[165]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[166]
-#define SWIGTYPE_p_wxShowEvent swig_types[167]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[168]
-#define SWIGTYPE_p_wxSize swig_types[169]
-#define SWIGTYPE_p_wxSizeEvent swig_types[170]
-#define SWIGTYPE_p_wxSizer swig_types[171]
-#define SWIGTYPE_p_wxSizerItem swig_types[172]
-#define SWIGTYPE_p_wxSplashScreen swig_types[173]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[174]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[175]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[176]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[177]
-#define SWIGTYPE_p_wxStatusBar swig_types[178]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[179]
-#define SWIGTYPE_p_wxString swig_types[180]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[181]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[182]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[183]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[184]
-#define SWIGTYPE_p_wxTipWindow swig_types[185]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[186]
-#define SWIGTYPE_p_wxTreeCtrl swig_types[187]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[188]
-#define SWIGTYPE_p_wxValidator swig_types[189]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[190]
-#define SWIGTYPE_p_wxWindow swig_types[191]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[192]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[193]
-#define SWIGTYPE_p_wxXPMHandler swig_types[194]
-static swig_type_info *swig_types[196];
-static swig_module_info swig_module = {swig_types, 195, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[85]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[86]
+#define SWIGTYPE_p_wxICOHandler swig_types[87]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[88]
+#define SWIGTYPE_p_wxIdleEvent swig_types[89]
+#define SWIGTYPE_p_wxImage swig_types[90]
+#define SWIGTYPE_p_wxImageHandler swig_types[91]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[92]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[93]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[94]
+#define SWIGTYPE_p_wxKeyEvent swig_types[95]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[96]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[97]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[98]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[99]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[100]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[101]
+#define SWIGTYPE_p_wxMenu swig_types[102]
+#define SWIGTYPE_p_wxMenuBar swig_types[103]
+#define SWIGTYPE_p_wxMenuEvent swig_types[104]
+#define SWIGTYPE_p_wxMenuItem swig_types[105]
+#define SWIGTYPE_p_wxMessageDialog swig_types[106]
+#define SWIGTYPE_p_wxMiniFrame swig_types[107]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[108]
+#define SWIGTYPE_p_wxMouseEvent swig_types[109]
+#define SWIGTYPE_p_wxMoveEvent swig_types[110]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[111]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[112]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[113]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[114]
+#define SWIGTYPE_p_wxObject swig_types[115]
+#define SWIGTYPE_p_wxPCXHandler swig_types[116]
+#define SWIGTYPE_p_wxPNGHandler swig_types[117]
+#define SWIGTYPE_p_wxPNMHandler swig_types[118]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[119]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[120]
+#define SWIGTYPE_p_wxPaintEvent swig_types[121]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[122]
+#define SWIGTYPE_p_wxPanel swig_types[123]
+#define SWIGTYPE_p_wxPaperSize swig_types[124]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[125]
+#define SWIGTYPE_p_wxPoint swig_types[126]
+#define SWIGTYPE_p_wxPopupWindow swig_types[127]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[128]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[129]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[130]
+#define SWIGTYPE_p_wxPrintData swig_types[131]
+#define SWIGTYPE_p_wxPrintDialog swig_types[132]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[133]
+#define SWIGTYPE_p_wxPrintPreview swig_types[134]
+#define SWIGTYPE_p_wxPrinter swig_types[135]
+#define SWIGTYPE_p_wxProgressDialog swig_types[136]
+#define SWIGTYPE_p_wxPyApp swig_types[137]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[138]
+#define SWIGTYPE_p_wxPyEvent swig_types[139]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[140]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[141]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[142]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[144]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[145]
+#define SWIGTYPE_p_wxPyPanel swig_types[146]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[147]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[148]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[149]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[150]
+#define SWIGTYPE_p_wxPyPrintout swig_types[151]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[152]
+#define SWIGTYPE_p_wxPySizer swig_types[153]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[154]
+#define SWIGTYPE_p_wxPyVListBox swig_types[155]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPyValidator swig_types[157]
+#define SWIGTYPE_p_wxPyWindow swig_types[158]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[159]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[160]
+#define SWIGTYPE_p_wxSashEvent swig_types[161]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[162]
+#define SWIGTYPE_p_wxSashWindow swig_types[163]
+#define SWIGTYPE_p_wxScrollEvent swig_types[164]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[165]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[166]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[167]
+#define SWIGTYPE_p_wxShowEvent swig_types[168]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[169]
+#define SWIGTYPE_p_wxSize swig_types[170]
+#define SWIGTYPE_p_wxSizeEvent swig_types[171]
+#define SWIGTYPE_p_wxSizer swig_types[172]
+#define SWIGTYPE_p_wxSizerItem swig_types[173]
+#define SWIGTYPE_p_wxSplashScreen swig_types[174]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[175]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[176]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[177]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[178]
+#define SWIGTYPE_p_wxStatusBar swig_types[179]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[180]
+#define SWIGTYPE_p_wxString swig_types[181]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[182]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[183]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[184]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[185]
+#define SWIGTYPE_p_wxTipWindow swig_types[186]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[187]
+#define SWIGTYPE_p_wxTreeCtrl swig_types[188]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[189]
+#define SWIGTYPE_p_wxValidator swig_types[190]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[191]
+#define SWIGTYPE_p_wxWindow swig_types[192]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[193]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[194]
+#define SWIGTYPE_p_wxXPMHandler swig_types[195]
+static swig_type_info *swig_types[197];
+static swig_module_info swig_module = {swig_types, 196, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3070,14 +3071,15 @@ public:
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);

-    DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
+    DEC_PYCALLBACK_BOOL_CELLINTINTME(OnCellClicked);
+

     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);

-IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
+IMP_PYCALLBACK_BOOL_CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);

 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {


@@ -4225,6 +4227,54 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlParser_GetInnerSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
+  wxHtmlTag *arg2 = 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "tag", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlParser_GetInnerSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "1"" of type '" "wxHtmlParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlParser * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlTag,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlTag * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (arg1)->GetInnerSource((wxHtmlTag const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -4418,6 +4468,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWinParser_GetWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
+  wxHtmlWindowInterface *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWinParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWinParser_GetWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWinParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWinParser * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlWindowInterface *)(arg1)->GetWindowInterface();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;


@@ -7150,6 +7228,45 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_GetMouseCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxCursor result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_GetMouseCursor",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetMouseCursor(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7614,6 +7731,66 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_ProcessMouseClick(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxMouseEvent *arg4 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window",(char *) "pos",(char *) "event", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlCell_ProcessMouseClick",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "1"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg4 = reinterpret_cast< wxMouseEvent * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->ProcessMouseClick(arg2,(wxPoint const &)*arg3,(wxMouseEvent const &)*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7825,28 +8002,71 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;

+  wxHtmlCell *arg2 = (wxHtmlCell *) NULL ;

   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "rootCell", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlCell_GetAbsPos",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+    }
+    arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetAbsPos(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCell_GetRootCell(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlCell *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetRootCell" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 

   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxHtmlCell const *)arg1)->GetAbsPos();
+    result = (wxHtmlCell *)((wxHtmlCell const *)arg1)->GetRootCell();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -9078,6 +9298,312 @@ SWIGINTERN PyObject *HtmlFilter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_HtmlWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HtmlWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLWindowTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "title", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLWindowTitle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLWindowTitle" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLWindowTitle((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_HTMLCoordsToWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxPoint result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "cell",(char *) "pos", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlWindowInterface_HTMLCoordsToWindow",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->HTMLCoordsToWindow(arg2,(wxPoint const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)(arg1)->GetHTMLWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->GetHTMLBackgroundColour();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "clr", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundColour((wxColour const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "bmpBg", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundImage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundImage((wxBitmap const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLStatusText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "text", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLStatusText",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLStatusText" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLStatusText((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlWindowInterface_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlWindowInterface, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+

 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -10689,6 +11215,7 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -10739,13 +11266,86 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);
+    result = (bool)(arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindow_OnOpeningURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
+  wxHtmlURLType arg2 ;
+  wxString *arg3 = 0 ;
+  wxString *arg4 = (wxString *) 0 ;
+  wxHtmlOpeningStatus result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool temp3 = false ;
+  bool temp4 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "type",(char *) "url",(char *) "redirect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_OnOpeningURL",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "1"" of type '" "wxPyHtmlWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "2"" of type '" "wxHtmlURLType""'");
+  } 
+  arg2 = static_cast< wxHtmlURLType >(val2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;
+  }
+  {
+    arg4 = wxString_in_helper(obj3);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlOpeningStatus)((wxPyHtmlWindow const *)arg1)->OnOpeningURL(arg2,(wxString const &)*arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
   return NULL;
 }
 


@@ -10783,6 +11383,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWindow_GetDefaultHTMLCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow::HTMLCursor arg1 ;
+  wxCursor result;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "type", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_GetDefaultHTMLCursor",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "HtmlWindow_GetDefaultHTMLCursor" "', expected argument " "1"" of type '" "wxPyHtmlWindow::HTMLCursor""'");
+  } 
+  arg1 = static_cast< wxPyHtmlWindow::HTMLCursor >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxPyHtmlWindow::GetDefaultHTMLCursor(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -16931,6 +17561,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},

+        { (char *)"HtmlParser_GetInnerSource", (PyCFunction) _wrap_HtmlParser_GetInnerSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -16938,6 +17569,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},

+        { (char *)"HtmlWinParser_GetWindowInterface", (PyCFunction)_wrap_HtmlWinParser_GetWindowInterface, METH_O, NULL},

         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},
         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},


@@ -17033,6 +17665,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},

+        { (char *)"HtmlCell_GetMouseCursor", (PyCFunction) _wrap_HtmlCell_GetMouseCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17043,12 +17676,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlCell_ProcessMouseClick", (PyCFunction) _wrap_HtmlCell_ProcessMouseClick, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"HtmlCell_GetAbsPos", (PyCFunction)_wrap_HtmlCell_GetAbsPos, METH_O, NULL},
+        { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCell_GetRootCell", (PyCFunction)_wrap_HtmlCell_GetRootCell, METH_O, NULL},

         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},


@@ -17094,6 +17729,15 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_HtmlWindowInterface", (PyCFunction)_wrap_delete_HtmlWindowInterface, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLWindowTitle", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLWindowTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_HTMLCoordsToWindow", (PyCFunction) _wrap_HtmlWindowInterface_HTMLCoordsToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLWindow", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLWindow, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLBackgroundColour", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLBackgroundColour, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundColour", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundImage", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLStatusText", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLStatusText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_swigregister", HtmlWindowInterface_swigregister, METH_VARARGS, NULL},

         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17133,7 +17777,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_OnOpeningURL", (PyCFunction) _wrap_HtmlWindow_OnOpeningURL, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_GetDefaultHTMLCursor", (PyCFunction) _wrap_HtmlWindow_GetDefaultHTMLCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},


@@ -18572,6 +19218,7 @@ static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHt
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};


@@ -18720,6 +19367,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,

+  &_swigt__p_wxHtmlWindowInterface,

   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,


@@ -18966,6 +19614,7 @@ static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidget
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -19114,6 +19763,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,

+  _swigc__p_wxHtmlWindowInterface,

   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,


@@ -19773,6 +20423,12 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));

+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Text)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Text)));

   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));
   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index ac47583bf37e3c2e5e28243c65bd71ac1004e9ae..dc27ebc479af84aba1d5ee5f97f2911de01ef544 100644 (file)
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -851,7 +851,7 @@ def ComboBox_GetClassDefaultAttributes(*args, **kwargs):
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH

-GA_PROGRESSBAR = _controls_.GA_PROGRESSBAR
+GA_PROGRESSBAR = 0 # obsolete 

 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -1478,9 +1478,9 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP

-TE_LINEWRAP = _controls_.TE_LINEWRAP

 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE
 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE

+TE_LINEWRAP = TE_CHARWRAP 

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE


@@ -2741,6 +2741,7 @@ BK_BOTTOM = _controls_.BK_BOTTOM
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK

+BK_BUTTONBAR = _controls_.BK_BUTTONBAR

 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -2799,17 +2800,25 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):

-        """GetInternalBorder(self) -> size_t"""
+        """GetInternalBorder(self) -> unsigned int"""

         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):

-        """SetInternalBorder(self, size_t internalBorder)"""
+        """SetInternalBorder(self, unsigned int internalBorder)"""

         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 
         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 

+    def SetControlMargin(*args, **kwargs):
+        """SetControlMargin(self, int margin)"""
+        return _controls_.BookCtrlBase_SetControlMargin(*args, **kwargs)
+
+    def GetControlMargin(*args, **kwargs):
+        """GetControlMargin(self) -> int"""
+        return _controls_.BookCtrlBase_GetControlMargin(*args, **kwargs)
+

     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)
     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)


@@ -2818,6 +2827,10 @@ class BookCtrlBase(_core.Control):
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 

+    def GetControlSizer(*args, **kwargs):
+        """GetControlSizer(self) -> Sizer"""
+        return _controls_.BookCtrlBase_GetControlSizer(*args, **kwargs)
+

     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)
     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)


@@ -3811,10 +3824,6 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 

-    def FindToolForPosition(*args, **kwargs):
-        """FindToolForPosition(self, int x, int y) -> ToolBarToolBase"""
-        return _controls_.ToolBar_FindToolForPosition(*args, **kwargs)
-

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -4386,10 +4395,12 @@ class ListCtrl(_core.Control):
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 

+    GetItemSpacing = wx._deprecated(GetItemSpacing) 

     def SetItemSpacing(*args, **kwargs):
         """SetItemSpacing(self, int spacing, bool isSmall=False)"""
         return _controls_.ListCtrl_SetItemSpacing(*args, **kwargs)
 
     def SetItemSpacing(*args, **kwargs):
         """SetItemSpacing(self, int spacing, bool isSmall=False)"""
         return _controls_.ListCtrl_SetItemSpacing(*args, **kwargs)
 

+    SetItemSpacing = wx._deprecated(SetItemSpacing) 

     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)
     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)


@@ -4746,8 +4757,10 @@ TR_ROW_LINES = _controls_.TR_ROW_LINES
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS

-TR_MAC_BUTTONS = _controls_.TR_MAC_BUTTONS
-TR_AQUA_BUTTONS = _controls_.TR_AQUA_BUTTONS
+# obsolete
+TR_MAC_BUTTONS = 0
+wxTR_AQUA_BUTTONS = 0
+

 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded
 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded


@@ -4978,7 +4991,7 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):

-        """GetCount(self) -> size_t"""
+        """GetCount(self) -> unsigned int"""

         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):
         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):

diff --git a/wxPython/src/mac/_controls_wrap.cpp b/wxPython/src/mac/_controls_wrap.cpp
index 8ef6785530a84f52ae72665a269fa08071ff83ff..6e91a02ed034327b4db52a2812c49707c3a505ae 100644 (file)
--- a/wxPython/src/mac/_controls_wrap.cpp
+++ b/wxPython/src/mac/_controls_wrap.cpp
@@ -2807,14 +2807,15 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>

-    

 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){
 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){

-            if (clientData) {
+            if (clientData)
+            {

                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);
                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);

-            } else
+            }
+            else

                 self->Insert(item, pos);
         }
 
                 self->Insert(item, pos);
         }
 


@@ -2847,12 +2848,15 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());
             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());

-            for(size_t i=0; i<lst.GetCount(); i++) {
+            for (size_t i=0; i<lst.GetCount(); i++)
+            {

                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }
                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }

+            wxPyEndBlockThreads(blocked);

             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){
             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){


@@ -19144,7 +19148,7 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -19158,11 +19162,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPA
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxBookCtrlBase const *)arg1)->GetInternalBorder();
+    result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -19172,10 +19176,10 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t arg2 ;
+  unsigned int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  unsigned int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;


@@ -19189,11 +19193,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);

-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "size_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "unsigned int""'");

   } 
   } 

-  arg2 = static_cast< size_t >(val2);
+  arg2 = static_cast< unsigned int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);


@@ -19237,6 +19241,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_SetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "margin", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetControlMargin",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetControlMargin(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBookCtrlBase const *)arg1)->GetControlMargin();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -19305,6 +19375,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  wxSizer *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlSizer" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizer *)((wxBookCtrlBase const *)arg1)->GetControlSizer();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -25238,56 +25338,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxToolBar *arg1 = (wxToolBar *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  wxToolBarToolBase *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
-  }
-  arg1 = reinterpret_cast< wxToolBar * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, (bool)0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;


@@ -33242,7 +33292,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -33256,11 +33306,11 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxPyTreeCtrl const *)arg1)->GetCount();
+    result = (unsigned int)((wxPyTreeCtrl const *)arg1)->GetCount();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -40950,8 +41000,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},

+        { (char *)"BookCtrlBase_SetControlMargin", (PyCFunction) _wrap_BookCtrlBase_SetControlMargin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BookCtrlBase_GetControlMargin", (PyCFunction)_wrap_BookCtrlBase_GetControlMargin, METH_O, NULL},

         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},
         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},

+        { (char *)"BookCtrlBase_GetControlSizer", (PyCFunction)_wrap_BookCtrlBase_GetControlSizer, METH_O, NULL},

         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},
         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},


@@ -41104,7 +41157,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},


@@ -43755,7 +43807,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));

-  SWIG_Python_SetConstant(d, "GA_PROGRESSBAR",SWIG_From_int(static_cast< int >(wxGA_PROGRESSBAR)));

   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);


@@ -43779,7 +43830,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));

-  SWIG_Python_SetConstant(d, "TE_LINEWRAP",SWIG_From_int(static_cast< int >(wxTE_LINEWRAP)));

   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));
   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));


@@ -43843,6 +43893,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));

+  SWIG_Python_SetConstant(d, "BK_BUTTONBAR",SWIG_From_int(static_cast< int >(wxBK_BUTTONBAR)));

   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));
   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));


@@ -44000,8 +44051,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));

-  SWIG_Python_SetConstant(d, "TR_MAC_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_MAC_BUTTONS)));
-  SWIG_Python_SetConstant(d, "TR_AQUA_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_AQUA_BUTTONS)));

   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));

diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py
index 26162f84fda98bc6b8e1c4fc28c635daf579b599..8fe054836803ccdd462aad2bc0b7d42ecbe85f18 100644 (file)
--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -133,6 +133,8 @@ SB_VERTICAL = _core_.SB_VERTICAL
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE

+ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE
+ST_DOTS_END = _core_.ST_DOTS_END

 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE
 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE


@@ -804,7 +806,7 @@ class Size(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Size sz) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Size objects.
         """
 
         Test for equality of wx.Size objects.
         """


@@ -812,9 +814,9 @@ class Size(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Size sz) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Size objects.

         """
         return _core_.Size___ne__(*args, **kwargs)
 
         """
         return _core_.Size___ne__(*args, **kwargs)
 


@@ -940,7 +942,7 @@ class RealPoint(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, RealPoint pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.RealPoint objects.
         """
 
         Test for equality of wx.RealPoint objects.
         """


@@ -948,7 +950,7 @@ class RealPoint(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, RealPoint pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.RealPoint objects.
         """
 
         Test for inequality of wx.RealPoint objects.
         """


@@ -1025,7 +1027,7 @@ class Point(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Point objects.
         """
 
         Test for equality of wx.Point objects.
         """


@@ -1033,7 +1035,7 @@ class Point(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.Point objects.
         """
 
         Test for inequality of wx.Point objects.
         """


@@ -1316,17 +1318,17 @@ class Rect(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Rect rect) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality.
+        Test for equality of wx.Rect objects.

         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Rect rect) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Rect objects.

         """
         return _core_.Rect___ne__(*args, **kwargs)
 
         """
         return _core_.Rect___ne__(*args, **kwargs)
 


@@ -1533,17 +1535,17 @@ class Point2D(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point2D pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality
+        Test for equality of wx.Point2D objects.

         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point2D pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality
+        Test for inequality of wx.Point2D objects.

         """
         return _core_.Point2D___ne__(*args, **kwargs)
 
         """
         return _core_.Point2D___ne__(*args, **kwargs)
 


@@ -11937,11 +11939,19 @@ class GBPosition(object):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBPosition other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare GBPosition for equality.
+        """

         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBPosition other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBPosition for inequality.
+        """

         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -12010,11 +12020,19 @@ class GBSpan(object):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBSpan other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare wxGBSpan for equality.
+        """

         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBSpan other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBSpan for inequality.
+        """

         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):

diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp
index a51236fa8621093a62ebf982bd6db7a4635303e0..86e26ffad0a0f011be6fe2e440375065e832761f 100644 (file)
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -2953,6 +2953,24 @@ SWIG_AsVal_int (PyObject * obj, int *val)
   return res;
 }
 
   return res;
 }
 

+SWIGINTERN bool wxSize___eq__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxSize_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxSize___ne__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxSize_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);


@@ -2975,6 +2993,24 @@ SWIG_AsVal_double (PyObject *obj, double* val)
 
   #define SWIG_From_double   PyFloat_FromDouble 
 
 
   #define SWIG_From_double   PyFloat_FromDouble 
 

+SWIGINTERN bool wxRealPoint___eq__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRealPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRealPoint___ne__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRealPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;


@@ -2987,6 +3023,24 @@ SWIGINTERN PyObject *wxRealPoint_Get(wxRealPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxPoint___eq__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint___ne__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;


@@ -2999,6 +3053,24 @@ SWIGINTERN PyObject *wxPoint_Get(wxPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxRect___eq__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRect_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRect___ne__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRect_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;


@@ -3036,6 +3108,24 @@ SWIGINTERN PyObject *wxRect_Get(wxRect *self){
         return Py_None;
     }
 
         return Py_None;
     }
 

+SWIGINTERN bool wxPoint2D___eq__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint2D_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint2D___ne__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint2D_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;
 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;


@@ -4148,6 +4238,24 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj)
 }
 
 
 }
 
 

+SWIGINTERN bool wxGBPosition___eq__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBPosition_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBPosition___ne__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBPosition_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);
 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);


@@ -4160,6 +4268,24 @@ SWIGINTERN PyObject *wxGBPosition_Get(wxGBPosition *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxGBSpan___eq__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBSpan_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBSpan___ne__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBSpan_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);
 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);


@@ -4498,15 +4624,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4515,14 +4640,9 @@ SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -4537,15 +4657,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4554,14 +4673,9 @@ SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5183,15 +5297,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5200,14 +5313,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5222,15 +5330,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5239,14 +5346,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5598,15 +5700,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5615,14 +5716,9 @@ SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5637,15 +5733,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5654,14 +5749,9 @@ SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7257,31 +7347,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator ==((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7296,31 +7380,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator !=((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8536,31 +8614,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator ==((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8575,31 +8647,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator !=((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48665,11 +48731,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48682,14 +48747,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48704,11 +48764,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48721,14 +48780,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49036,11 +49090,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49053,14 +49106,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49075,11 +49123,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49092,14 +49139,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -55399,6 +55441,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));

+  SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE)));
+  SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END)));

   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));
   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 65e8b143fc60d118bb49e314f2559cb1f45f67f8..b7d55777415a3a3f6c49ead000a48d46d71a1667 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -188,17 +188,17 @@ class Colour(_core.Object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Colour colour) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Compare colours for equality
+        Compare colours for equality.

         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Colour colour) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Compare colours for inequality
+        Compare colours for inequality.

         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 
         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 

diff --git a/wxPython/src/mac/_gdi_wrap.cpp b/wxPython/src/mac/_gdi_wrap.cpp
index bbc20f1c6589db5e2c323a68c86dba68b9fedea8..9a48da37f259bcd634b1dcade044e4a6abd6c536 100644 (file)
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -2786,6 +2786,24 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
   return SWIG_From_unsigned_SS_long  (value);
 }
 
   return SWIG_From_unsigned_SS_long  (value);
 }
 

+SWIGINTERN bool wxColour___eq__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxColour_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxColour___ne__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxColour_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;
 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;


@@ -3079,18 +3097,26 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetEncodings();
             wxArrayString* arr = self->GetEncodings();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret = PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetFacenames();
             wxArrayString* arr = self->GetFacenames();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret =  PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
 #include <locale.h>
         }
 
 #include <locale.h>


@@ -3823,31 +3849,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator ==((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -3862,31 +3882,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator !=((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 102db9c4a95a67dc867bf00fdfc3369f35b02832..01505bf8b0dd698836b9e8edd4590b10fab2787a 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -313,6 +313,7 @@ def EndBusyCursor(*args):
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)

+GetElapsedTime = wx._deprecated(GetElapsedTime) 

 
 def IsBusy(*args):
   """IsBusy() -> bool"""
 
 def IsBusy(*args):
   """IsBusy() -> bool"""


@@ -3834,6 +3835,16 @@ class TimeSpan(object):
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr

+    def Milliseconds(*args, **kwargs):
+        """Milliseconds(long ms) -> TimeSpan"""
+        return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+    Milliseconds = staticmethod(Milliseconds)
+    def Millisecond(*args, **kwargs):
+        """Millisecond() -> TimeSpan"""
+        return _misc_.TimeSpan_Millisecond(*args, **kwargs)
+
+    Millisecond = staticmethod(Millisecond)

     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)
     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4026,6 +4037,14 @@ class TimeSpan(object):
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 

+def TimeSpan_Milliseconds(*args, **kwargs):
+  """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
+  return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+def TimeSpan_Millisecond(*args):
+  """TimeSpan_Millisecond() -> TimeSpan"""
+  return _misc_.TimeSpan_Millisecond(*args)
+

 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)
 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4595,6 +4614,17 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 

+    def GetReceivedFormat(*args, **kwargs):
+        """
+        GetReceivedFormat(self) -> DataFormat
+
+        Report the format passed to the `SetData` method.  This should be the
+        format of the data object within the composite that recieved data from
+        the clipboard or the DnD operation.  You can use this method to find
+        out what kind of data object was recieved.
+        """
+        return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
+

 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 
 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 


@@ -5624,14 +5654,13 @@ def Display_GetFromWindow(*args, **kwargs):
 
 class StandardPaths(object):
     """
 
 class StandardPaths(object):
     """

-    wx.StandardPaths returns the standard locations in the file system and
-    should be used by the programs to find their data files in a portable
-    way.
+    wx.StandardPaths returns standard locations in the file system and
+    should be used by programs to find their data files in a portable way.

 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note
 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note

-    that these are just the examples and the actual values may differ. For
-    example, under Windows: the system administrator may change the
+    that these are just  examples and the actual values may differ. For
+    example, under Windows the system administrator may change the

     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 
     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 


@@ -5642,7 +5671,7 @@ class StandardPaths(object):
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,

-    wxStandardPaths doesn't do it.
+    wx.StandardPaths doesn't do it.

 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard
 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard


@@ -5653,6 +5682,9 @@ class StandardPaths(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    ResourceCat_None = _misc_.StandardPaths_ResourceCat_None
+    ResourceCat_Messages = _misc_.StandardPaths_ResourceCat_Messages
+    ResourceCat_Max = _misc_.StandardPaths_ResourceCat_Max

     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths
     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths


@@ -5739,6 +5771,32 @@ class StandardPaths(object):
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 

+    def GetResourcesDir(*args, **kwargs):
+        """
+        GetResourcesDir(self) -> String
+
+        Get resources directory.  Resources are auxiliary files used by the
+        application and include things like image and sound files.
+
+        Same as `GetDataDir` for all platforms except Mac where it returns
+        Contents/Resources subdirectory of the app bundle.
+        """
+        return _misc_.StandardPaths_GetResourcesDir(*args, **kwargs)
+
+    def GetLocalizedResourcesDir(*args, **kwargs):
+        """
+        GetLocalizedResourcesDir(self, String lang, int category=ResourceCat_None) -> String
+
+        Get localized resources directory containing the resource files of the
+        specified category for the given language.
+
+        In general this is just GetResourcesDir()/lang under Windows and Unix
+        and GetResourcesDir()/lang.lproj under Mac but is something quite
+        different under Unix for the message catalog category (namely the
+        standard prefix/share/locale/lang/LC_MESSAGES.)
+        """
+        return _misc_.StandardPaths_GetLocalizedResourcesDir(*args, **kwargs)
+

     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)
     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)

diff --git a/wxPython/src/mac/_misc_wrap.cpp b/wxPython/src/mac/_misc_wrap.cpp
index 98814c3638a3821d21d3988736a4cbb215d51e92..13f7365a7fb22b2bfdeb97bebafe6ef6d78827be 100644 (file)
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -3531,12 +3531,14 @@ SWIGINTERN void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; }
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {

+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }

+        wxPyEndBlockThreads(blocked);

         return ret;
     }
 
         return ret;
     }
 


@@ -27290,6 +27292,54 @@ SWIGINTERN PyObject *DateTime_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_TimeSpan_Milliseconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  long arg1 ;
+  wxTimeSpan result;
+  long val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ms", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Milliseconds",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_long(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "TimeSpan_Milliseconds" "', expected argument " "1"" of type '" "long""'");
+  } 
+  arg1 = static_cast< long >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Milliseconds(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TimeSpan_Millisecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxTimeSpan result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"TimeSpan_Millisecond",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Millisecond();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;
 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;


@@ -31304,6 +31354,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DataObjectComposite_GetReceivedFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ;
+  SwigValueWrapper<wxDataFormat > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataObjectComposite, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataObjectComposite_GetReceivedFormat" "', expected argument " "1"" of type '" "wxDataObjectComposite const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDataObjectComposite * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDataObjectComposite const *)arg1)->GetReceivedFormat();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxDataFormat(static_cast< const wxDataFormat& >(result))), SWIGTYPE_p_wxDataFormat, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -35691,6 +35769,103 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_StandardPaths_GetResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetResourcesDir();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StandardPaths_GetLocalizedResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString *arg2 = 0 ;
+  wxStandardPaths::ResourceCat arg3 = (wxStandardPaths::ResourceCat) wxStandardPaths::ResourceCat_None ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "lang",(char *) "category", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StandardPaths_GetLocalizedResourcesDir",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "3"" of type '" "wxStandardPaths::ResourceCat""'");
+    } 
+    arg3 = static_cast< wxStandardPaths::ResourceCat >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetLocalizedResourcesDir((wxString const &)*arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;


@@ -36414,6 +36589,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},

+        { (char *)"TimeSpan_Milliseconds", (PyCFunction) _wrap_TimeSpan_Milliseconds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TimeSpan_Millisecond", (PyCFunction)_wrap_TimeSpan_Millisecond, METH_NOARGS, NULL},

         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36533,6 +36710,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DataObjectComposite_GetReceivedFormat", (PyCFunction)_wrap_DataObjectComposite_GetReceivedFormat, METH_O, NULL},

         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36683,6 +36861,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},

+        { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL},
+        { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},
         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},


@@ -38841,5 +39021,8 @@ SWIGEXPORT void SWIG_init(void) {
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);

+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_None",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_None)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Messages",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Messages)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Max",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Max)));

 }
 
 }
 

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index f6b9d46229b2c468cdda44a4cf4c23febbf60096..7ac4035325eeca52ccd48490b302b0d92dd9c637 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -1937,6 +1937,10 @@ class HtmlListBox(VListBox):
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 

+    def OnLinkClicked(*args, **kwargs):
+        """OnLinkClicked(self, size_t n, wxHtmlLinkInfo link)"""
+        return _windows_.HtmlListBox_OnLinkClicked(*args, **kwargs)
+

 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 
 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 

diff --git a/wxPython/src/mac/_windows_wrap.cpp b/wxPython/src/mac/_windows_wrap.cpp
index e0d021cd47e4cca6c3151a63de898ad08d003a66..b0db9fd215ba14d6c56f1f035158bca7f24d80af 100644 (file)
--- a/wxPython/src/mac/_windows_wrap.cpp
+++ b/wxPython/src/mac/_windows_wrap.cpp
@@ -2509,118 +2509,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]

-#define SWIGTYPE_p_wxICOHandler swig_types[50]
-#define SWIGTYPE_p_wxIcon swig_types[51]
-#define SWIGTYPE_p_wxIconBundle swig_types[52]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[53]
-#define SWIGTYPE_p_wxIdleEvent swig_types[54]
-#define SWIGTYPE_p_wxImage swig_types[55]
-#define SWIGTYPE_p_wxImageHandler swig_types[56]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[57]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[58]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[59]
-#define SWIGTYPE_p_wxKeyEvent swig_types[60]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[61]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[62]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[63]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[64]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[65]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[66]
-#define SWIGTYPE_p_wxMenu swig_types[67]
-#define SWIGTYPE_p_wxMenuBar swig_types[68]
-#define SWIGTYPE_p_wxMenuEvent swig_types[69]
-#define SWIGTYPE_p_wxMenuItem swig_types[70]
-#define SWIGTYPE_p_wxMessageDialog swig_types[71]
-#define SWIGTYPE_p_wxMiniFrame swig_types[72]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[73]
-#define SWIGTYPE_p_wxMouseEvent swig_types[74]
-#define SWIGTYPE_p_wxMoveEvent swig_types[75]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[76]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[77]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[78]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[79]
-#define SWIGTYPE_p_wxObject swig_types[80]
-#define SWIGTYPE_p_wxPCXHandler swig_types[81]
-#define SWIGTYPE_p_wxPNGHandler swig_types[82]
-#define SWIGTYPE_p_wxPNMHandler swig_types[83]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[84]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85]
-#define SWIGTYPE_p_wxPaintEvent swig_types[86]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[87]
-#define SWIGTYPE_p_wxPanel swig_types[88]
-#define SWIGTYPE_p_wxPaperSize swig_types[89]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[90]
-#define SWIGTYPE_p_wxPoint swig_types[91]
-#define SWIGTYPE_p_wxPopupWindow swig_types[92]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[93]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[94]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[95]
-#define SWIGTYPE_p_wxPrintData swig_types[96]
-#define SWIGTYPE_p_wxPrintDialog swig_types[97]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[98]
-#define SWIGTYPE_p_wxPrintPreview swig_types[99]
-#define SWIGTYPE_p_wxPrinter swig_types[100]
-#define SWIGTYPE_p_wxProgressDialog swig_types[101]
-#define SWIGTYPE_p_wxPyApp swig_types[102]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[103]
-#define SWIGTYPE_p_wxPyEvent swig_types[104]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[105]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[106]
-#define SWIGTYPE_p_wxPyPanel swig_types[107]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[108]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[109]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[110]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[111]
-#define SWIGTYPE_p_wxPyPrintout swig_types[112]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[113]
-#define SWIGTYPE_p_wxPySizer swig_types[114]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[115]
-#define SWIGTYPE_p_wxPyVListBox swig_types[116]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[117]
-#define SWIGTYPE_p_wxPyValidator swig_types[118]
-#define SWIGTYPE_p_wxPyWindow swig_types[119]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[120]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[121]
-#define SWIGTYPE_p_wxRect swig_types[122]
-#define SWIGTYPE_p_wxRegion swig_types[123]
-#define SWIGTYPE_p_wxSashEvent swig_types[124]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[125]
-#define SWIGTYPE_p_wxSashWindow swig_types[126]
-#define SWIGTYPE_p_wxScrollEvent swig_types[127]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[128]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[129]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[130]
-#define SWIGTYPE_p_wxShowEvent swig_types[131]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[132]
-#define SWIGTYPE_p_wxSize swig_types[133]
-#define SWIGTYPE_p_wxSizeEvent swig_types[134]
-#define SWIGTYPE_p_wxSizer swig_types[135]
-#define SWIGTYPE_p_wxSizerItem swig_types[136]
-#define SWIGTYPE_p_wxSplashScreen swig_types[137]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[138]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[139]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[140]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[141]
-#define SWIGTYPE_p_wxStatusBar swig_types[142]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[143]
-#define SWIGTYPE_p_wxString swig_types[144]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[145]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[146]
-#define SWIGTYPE_p_wxTaskBarIcon swig_types[147]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[148]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[149]
-#define SWIGTYPE_p_wxTipWindow swig_types[150]
-#define SWIGTYPE_p_wxToolBar swig_types[151]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[152]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[153]
-#define SWIGTYPE_p_wxValidator swig_types[154]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[155]
-#define SWIGTYPE_p_wxWindow swig_types[156]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[157]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[158]
-#define SWIGTYPE_p_wxXPMHandler swig_types[159]
-static swig_type_info *swig_types[161];
-static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[50]
+#define SWIGTYPE_p_wxICOHandler swig_types[51]
+#define SWIGTYPE_p_wxIcon swig_types[52]
+#define SWIGTYPE_p_wxIconBundle swig_types[53]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[54]
+#define SWIGTYPE_p_wxIdleEvent swig_types[55]
+#define SWIGTYPE_p_wxImage swig_types[56]
+#define SWIGTYPE_p_wxImageHandler swig_types[57]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[58]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[59]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[60]
+#define SWIGTYPE_p_wxKeyEvent swig_types[61]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[62]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[63]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[64]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[65]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[66]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[67]
+#define SWIGTYPE_p_wxMenu swig_types[68]
+#define SWIGTYPE_p_wxMenuBar swig_types[69]
+#define SWIGTYPE_p_wxMenuEvent swig_types[70]
+#define SWIGTYPE_p_wxMenuItem swig_types[71]
+#define SWIGTYPE_p_wxMessageDialog swig_types[72]
+#define SWIGTYPE_p_wxMiniFrame swig_types[73]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[74]
+#define SWIGTYPE_p_wxMouseEvent swig_types[75]
+#define SWIGTYPE_p_wxMoveEvent swig_types[76]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[77]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[78]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[79]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[80]
+#define SWIGTYPE_p_wxObject swig_types[81]
+#define SWIGTYPE_p_wxPCXHandler swig_types[82]
+#define SWIGTYPE_p_wxPNGHandler swig_types[83]
+#define SWIGTYPE_p_wxPNMHandler swig_types[84]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[85]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[86]
+#define SWIGTYPE_p_wxPaintEvent swig_types[87]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[88]
+#define SWIGTYPE_p_wxPanel swig_types[89]
+#define SWIGTYPE_p_wxPaperSize swig_types[90]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[91]
+#define SWIGTYPE_p_wxPoint swig_types[92]
+#define SWIGTYPE_p_wxPopupWindow swig_types[93]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[94]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[95]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[96]
+#define SWIGTYPE_p_wxPrintData swig_types[97]
+#define SWIGTYPE_p_wxPrintDialog swig_types[98]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[99]
+#define SWIGTYPE_p_wxPrintPreview swig_types[100]
+#define SWIGTYPE_p_wxPrinter swig_types[101]
+#define SWIGTYPE_p_wxProgressDialog swig_types[102]
+#define SWIGTYPE_p_wxPyApp swig_types[103]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[104]
+#define SWIGTYPE_p_wxPyEvent swig_types[105]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[106]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[107]
+#define SWIGTYPE_p_wxPyPanel swig_types[108]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[109]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[110]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[111]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[112]
+#define SWIGTYPE_p_wxPyPrintout swig_types[113]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[114]
+#define SWIGTYPE_p_wxPySizer swig_types[115]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[116]
+#define SWIGTYPE_p_wxPyVListBox swig_types[117]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[118]
+#define SWIGTYPE_p_wxPyValidator swig_types[119]
+#define SWIGTYPE_p_wxPyWindow swig_types[120]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[121]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[122]
+#define SWIGTYPE_p_wxRect swig_types[123]
+#define SWIGTYPE_p_wxRegion swig_types[124]
+#define SWIGTYPE_p_wxSashEvent swig_types[125]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[126]
+#define SWIGTYPE_p_wxSashWindow swig_types[127]
+#define SWIGTYPE_p_wxScrollEvent swig_types[128]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[129]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[130]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[131]
+#define SWIGTYPE_p_wxShowEvent swig_types[132]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[133]
+#define SWIGTYPE_p_wxSize swig_types[134]
+#define SWIGTYPE_p_wxSizeEvent swig_types[135]
+#define SWIGTYPE_p_wxSizer swig_types[136]
+#define SWIGTYPE_p_wxSizerItem swig_types[137]
+#define SWIGTYPE_p_wxSplashScreen swig_types[138]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[139]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[140]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[141]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[142]
+#define SWIGTYPE_p_wxStatusBar swig_types[143]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[144]
+#define SWIGTYPE_p_wxString swig_types[145]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[146]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[147]
+#define SWIGTYPE_p_wxTaskBarIcon swig_types[148]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[149]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[150]
+#define SWIGTYPE_p_wxTipWindow swig_types[151]
+#define SWIGTYPE_p_wxToolBar swig_types[152]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[153]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[154]
+#define SWIGTYPE_p_wxValidator swig_types[155]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[156]
+#define SWIGTYPE_p_wxWindow swig_types[157]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[158]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[159]
+#define SWIGTYPE_p_wxXPMHandler swig_types[160]
+static swig_type_info *swig_types[162];
+static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3099,6 +3100,11 @@ public:
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 

+    
+    // This method may be overriden to handle clicking on a link in
+    // the listbox. By default, clicking links is ignored.
+    virtual void OnLinkClicked(size_t n,
+                               const wxHtmlLinkInfo& link);        

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3112,6 +3118,21 @@ IMP_PYCALLBACK__DCRECTSIZET2_const   (wxPyHtmlListBox, wxHtmlListBox, OnDrawSepa
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 

+void wxPyHtmlListBox::OnLinkClicked(size_t n,
+                                    const wxHtmlLinkInfo& link) {
+    bool found;
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
+        PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", n, obj));
+        Py_DECREF(obj);
+    }
+    wxPyEndBlockThreads(blocked);
+    if (! found)
+        wxPyHtmlListBox::OnLinkClicked(n, link);
+}
+ 
+

 
 
 
 
 
 


@@ -15456,6 +15477,56 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlListBox_OnLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
+  size_t arg2 ;
+  wxHtmlLinkInfo *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "n",(char *) "link", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlListBox_OnLinkClicked",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlListBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "1"" of type '" "wxPyHtmlListBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlListBox * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxHtmlLinkInfo * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->OnLinkClicked(arg2,(wxHtmlLinkInfo const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -30624,6 +30695,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},

+        { (char *)"HtmlListBox_OnLinkClicked", (PyCFunction) _wrap_HtmlListBox_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},


@@ -32147,6 +32219,7 @@ static swig_type_info _swigt__p_wxFont = {"_p_wxFont", "wxFont *", 0, 0, (void*)
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};


@@ -32293,6 +32366,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,

+  &_swigt__p_wxHtmlLinkInfo,

   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,


@@ -32471,6 +32545,7 @@ static swig_cast_info _swigc__p_wxFont[] = {  {&_swigt__p_wxFont, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxTipWindow, _p_wxTipWindowTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};


@@ -32617,6 +32692,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,

+  _swigc__p_wxHtmlLinkInfo,

   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,

diff --git a/wxPython/src/mac/grid.py b/wxPython/src/mac/grid.py
index 73fd329aaa65d47cdb6d6d5b47ff6a2f39124d7f..4cb321f50a32b5373c2a1eeaada232c728996ad8 100644 (file)
--- a/wxPython/src/mac/grid.py
+++ b/wxPython/src/mac/grid.py
@@ -736,6 +736,8 @@ class GridTableBase(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    __swig_destroy__ = _grid.delete_GridTableBase
+    __del__ = lambda self : None;

     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)
     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)


@@ -1094,11 +1096,19 @@ class GridCellCoords(object):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GridCellCoords other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Test for equality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GridCellCoords other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Test for inequality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):
         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):


@@ -2027,6 +2037,10 @@ class GridEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridEvent_CmdDown(*args, **kwargs)
+

 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 
 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 


@@ -2065,6 +2079,10 @@ class GridSizeEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridSizeEvent_CmdDown(*args, **kwargs)
+

 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 
 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 


@@ -2124,6 +2142,10 @@ class GridRangeSelectEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs)
+

 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 
 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 

diff --git a/wxPython/src/mac/grid_wrap.cpp b/wxPython/src/mac/grid_wrap.cpp
index 51cdd0e5dd4f85ad429c311408c00b9295bd9107..b82447403a46a830e7d81a7d0c270d730fd6c80f 100644 (file)
--- a/wxPython/src/mac/grid_wrap.cpp
+++ b/wxPython/src/mac/grid_wrap.cpp
@@ -3737,6 +3737,24 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)
     return list;
 }
 
     return list;
 }
 

+SWIGINTERN bool wxGridCellCoords___eq__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGridCellCoords_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGridCellCoords___ne__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGridCellCoords_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));


@@ -7625,6 +7643,34 @@ SWIGINTERN PyObject *PyGridCellAttrProvider_swiginit(PyObject *SWIGUNUSEDPARM(se
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_GridTableBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GridTableBase" "', expected argument " "1"" of type '" "wxGridTableBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridTableBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;


@@ -10053,11 +10099,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10067,17 +10112,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator ==((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10092,11 +10132,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10106,17 +10145,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator !=((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10646,7 +10680,6 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;

   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;


@@ -10666,11 +10699,10 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGridTableBase, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'");

   }
   }

-  arg2 = reinterpret_cast< wxGridTableBase * >(argp2);

   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {


@@ -18842,6 +18874,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridEvent *arg1 = (wxGridEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19154,6 +19216,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridSizeEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridSizeEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridSizeEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridSizeEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridSizeEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19600,6 +19692,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridRangeSelectEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridRangeSelectEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridRangeSelectEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridRangeSelectEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridRangeSelectEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -20039,6 +20161,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_GridTableBase", (PyCFunction)_wrap_delete_GridTableBase, METH_O, NULL},

         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},
         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},


@@ -20319,6 +20442,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},

+        { (char *)"GridEvent_CmdDown", (PyCFunction)_wrap_GridEvent_CmdDown, METH_O, NULL},

         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20328,6 +20452,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},

+        { (char *)"GridSizeEvent_CmdDown", (PyCFunction)_wrap_GridSizeEvent_CmdDown, METH_O, NULL},

         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20342,6 +20467,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},

+        { (char *)"GridRangeSelectEvent_CmdDown", (PyCFunction)_wrap_GridRangeSelectEvent_CmdDown, METH_O, NULL},

         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/mac/html.py b/wxPython/src/mac/html.py
index ac71f5126c443b7d0aee754332761282d37c4972..f2c18521a362ebb12409a6736063a4e21f6c04b6 100644 (file)
--- a/wxPython/src/mac/html.py
+++ b/wxPython/src/mac/html.py
@@ -224,6 +224,10 @@ class HtmlParser(_core.Object):
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 

+    def GetInnerSource(*args, **kwargs):
+        """GetInnerSource(self, HtmlTag tag) -> String"""
+        return _html.HtmlParser_GetInnerSource(*args, **kwargs)
+

 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 
 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 


@@ -254,6 +258,11 @@ class HtmlWinParser(HtmlParser):
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 

+    GetWindow = wx._deprecated(GetWindow) 
+    def GetWindowInterface(*args, **kwargs):
+        """GetWindowInterface(self) -> HtmlWindowInterface"""
+        return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
+

     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)


@@ -639,10 +648,15 @@ class HtmlCell(_core.Object):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 

+    def GetMouseCursor(*args, **kwargs):
+        """GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
+        return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
+

     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 

+    GetCursor = wx._deprecated(GetCursor) 

     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)


@@ -679,6 +693,10 @@ class HtmlCell(_core.Object):
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 

+    def ProcessMouseClick(*args, **kwargs):
+        """ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
+        return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
+

     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)


@@ -700,9 +718,13 @@ class HtmlCell(_core.Object):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):

-        """GetAbsPos(self) -> Point"""
+        """GetAbsPos(self, HtmlCell rootCell=None) -> Point"""

         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 
         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 

+    def GetRootCell(*args, **kwargs):
+        """GetRootCell(self) -> HtmlCell"""
+        return _html.HtmlCell_GetRootCell(*args, **kwargs)
+

     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)


@@ -870,6 +892,47 @@ class HtmlFilter(_core.Object):
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 

+class HtmlWindowInterface(object):
+    """Proxy of C++ HtmlWindowInterface class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _html.delete_HtmlWindowInterface
+    __del__ = lambda self : None;
+    def SetHTMLWindowTitle(*args, **kwargs):
+        """SetHTMLWindowTitle(self, String title)"""
+        return _html.HtmlWindowInterface_SetHTMLWindowTitle(*args, **kwargs)
+
+    def HTMLCoordsToWindow(*args, **kwargs):
+        """HTMLCoordsToWindow(self, HtmlCell cell, Point pos) -> Point"""
+        return _html.HtmlWindowInterface_HTMLCoordsToWindow(*args, **kwargs)
+
+    def GetHTMLWindow(*args, **kwargs):
+        """GetHTMLWindow(self) -> Window"""
+        return _html.HtmlWindowInterface_GetHTMLWindow(*args, **kwargs)
+
+    def GetHTMLBackgroundColour(*args, **kwargs):
+        """GetHTMLBackgroundColour(self) -> Colour"""
+        return _html.HtmlWindowInterface_GetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundColour(*args, **kwargs):
+        """SetHTMLBackgroundColour(self, Colour clr)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundImage(*args, **kwargs):
+        """SetHTMLBackgroundImage(self, Bitmap bmpBg)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundImage(*args, **kwargs)
+
+    def SetHTMLStatusText(*args, **kwargs):
+        """SetHTMLStatusText(self, String text)"""
+        return _html.HtmlWindowInterface_SetHTMLStatusText(*args, **kwargs)
+
+    HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text
+HtmlWindowInterface_swigregister = _html.HtmlWindowInterface_swigregister
+HtmlWindowInterface_swigregister(HtmlWindowInterface)
+

 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):


@@ -1035,9 +1098,13 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):

-        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
+        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event) -> bool"""

         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 
         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 

+    def OnOpeningURL(*args, **kwargs):
+        """OnOpeningURL(self, int type, String url, String redirect) -> int"""
+        return _html.HtmlWindow_OnOpeningURL(*args, **kwargs)
+

     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,
     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,


@@ -1076,6 +1143,14 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    HTMLCursor_Default = _html.HtmlWindow_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindow_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindow_HTMLCursor_Text
+    def GetDefaultHTMLCursor(*args, **kwargs):
+        """GetDefaultHTMLCursor(int type) -> Cursor"""
+        return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+
+    GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor)

 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 
 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 


@@ -1105,6 +1180,10 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 

+def HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs):
+  """HtmlWindow_GetDefaultHTMLCursor(int type) -> Cursor"""
+  return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):


@@ -1599,7 +1678,7 @@ class HtmlHelpFrame(_windows.Frame):
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)

-         
+

     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):
     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):

diff --git a/wxPython/src/mac/html_wrap.cpp b/wxPython/src/mac/html_wrap.cpp
index a429fff29df2004abb1c6806061ba4719bd1df3e..d55fde12a1762923d444292f4a202bda4c3e1660 100644 (file)
--- a/wxPython/src/mac/html_wrap.cpp
+++ b/wxPython/src/mac/html_wrap.cpp
@@ -2544,118 +2544,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]

-#define SWIGTYPE_p_wxHtmlWordCell swig_types[85]
-#define SWIGTYPE_p_wxICOHandler swig_types[86]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[87]
-#define SWIGTYPE_p_wxIdleEvent swig_types[88]
-#define SWIGTYPE_p_wxImage swig_types[89]
-#define SWIGTYPE_p_wxImageHandler swig_types[90]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[91]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[92]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[93]
-#define SWIGTYPE_p_wxKeyEvent swig_types[94]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[95]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[96]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[97]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[98]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[99]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[100]
-#define SWIGTYPE_p_wxMenu swig_types[101]
-#define SWIGTYPE_p_wxMenuBar swig_types[102]
-#define SWIGTYPE_p_wxMenuEvent swig_types[103]
-#define SWIGTYPE_p_wxMenuItem swig_types[104]
-#define SWIGTYPE_p_wxMessageDialog swig_types[105]
-#define SWIGTYPE_p_wxMiniFrame swig_types[106]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[107]
-#define SWIGTYPE_p_wxMouseEvent swig_types[108]
-#define SWIGTYPE_p_wxMoveEvent swig_types[109]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[110]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[111]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[112]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[113]
-#define SWIGTYPE_p_wxObject swig_types[114]
-#define SWIGTYPE_p_wxPCXHandler swig_types[115]
-#define SWIGTYPE_p_wxPNGHandler swig_types[116]
-#define SWIGTYPE_p_wxPNMHandler swig_types[117]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[118]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[119]
-#define SWIGTYPE_p_wxPaintEvent swig_types[120]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[121]
-#define SWIGTYPE_p_wxPanel swig_types[122]
-#define SWIGTYPE_p_wxPaperSize swig_types[123]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[124]
-#define SWIGTYPE_p_wxPoint swig_types[125]
-#define SWIGTYPE_p_wxPopupWindow swig_types[126]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[127]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[128]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[129]
-#define SWIGTYPE_p_wxPrintData swig_types[130]
-#define SWIGTYPE_p_wxPrintDialog swig_types[131]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[132]
-#define SWIGTYPE_p_wxPrintPreview swig_types[133]
-#define SWIGTYPE_p_wxPrinter swig_types[134]
-#define SWIGTYPE_p_wxProgressDialog swig_types[135]
-#define SWIGTYPE_p_wxPyApp swig_types[136]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[137]
-#define SWIGTYPE_p_wxPyEvent swig_types[138]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[139]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[140]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[141]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[142]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[143]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[144]
-#define SWIGTYPE_p_wxPyPanel swig_types[145]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[146]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[147]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[148]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[149]
-#define SWIGTYPE_p_wxPyPrintout swig_types[150]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[151]
-#define SWIGTYPE_p_wxPySizer swig_types[152]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[153]
-#define SWIGTYPE_p_wxPyVListBox swig_types[154]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[155]
-#define SWIGTYPE_p_wxPyValidator swig_types[156]
-#define SWIGTYPE_p_wxPyWindow swig_types[157]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[158]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[159]
-#define SWIGTYPE_p_wxSashEvent swig_types[160]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[161]
-#define SWIGTYPE_p_wxSashWindow swig_types[162]
-#define SWIGTYPE_p_wxScrollEvent swig_types[163]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[164]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[165]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[166]
-#define SWIGTYPE_p_wxShowEvent swig_types[167]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[168]
-#define SWIGTYPE_p_wxSize swig_types[169]
-#define SWIGTYPE_p_wxSizeEvent swig_types[170]
-#define SWIGTYPE_p_wxSizer swig_types[171]
-#define SWIGTYPE_p_wxSizerItem swig_types[172]
-#define SWIGTYPE_p_wxSplashScreen swig_types[173]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[174]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[175]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[176]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[177]
-#define SWIGTYPE_p_wxStatusBar swig_types[178]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[179]
-#define SWIGTYPE_p_wxString swig_types[180]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[181]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[182]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[183]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[184]
-#define SWIGTYPE_p_wxTipWindow swig_types[185]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[186]
-#define SWIGTYPE_p_wxTreeCtrl swig_types[187]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[188]
-#define SWIGTYPE_p_wxValidator swig_types[189]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[190]
-#define SWIGTYPE_p_wxWindow swig_types[191]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[192]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[193]
-#define SWIGTYPE_p_wxXPMHandler swig_types[194]
-static swig_type_info *swig_types[196];
-static swig_module_info swig_module = {swig_types, 195, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[85]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[86]
+#define SWIGTYPE_p_wxICOHandler swig_types[87]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[88]
+#define SWIGTYPE_p_wxIdleEvent swig_types[89]
+#define SWIGTYPE_p_wxImage swig_types[90]
+#define SWIGTYPE_p_wxImageHandler swig_types[91]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[92]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[93]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[94]
+#define SWIGTYPE_p_wxKeyEvent swig_types[95]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[96]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[97]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[98]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[99]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[100]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[101]
+#define SWIGTYPE_p_wxMenu swig_types[102]
+#define SWIGTYPE_p_wxMenuBar swig_types[103]
+#define SWIGTYPE_p_wxMenuEvent swig_types[104]
+#define SWIGTYPE_p_wxMenuItem swig_types[105]
+#define SWIGTYPE_p_wxMessageDialog swig_types[106]
+#define SWIGTYPE_p_wxMiniFrame swig_types[107]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[108]
+#define SWIGTYPE_p_wxMouseEvent swig_types[109]
+#define SWIGTYPE_p_wxMoveEvent swig_types[110]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[111]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[112]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[113]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[114]
+#define SWIGTYPE_p_wxObject swig_types[115]
+#define SWIGTYPE_p_wxPCXHandler swig_types[116]
+#define SWIGTYPE_p_wxPNGHandler swig_types[117]
+#define SWIGTYPE_p_wxPNMHandler swig_types[118]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[119]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[120]
+#define SWIGTYPE_p_wxPaintEvent swig_types[121]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[122]
+#define SWIGTYPE_p_wxPanel swig_types[123]
+#define SWIGTYPE_p_wxPaperSize swig_types[124]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[125]
+#define SWIGTYPE_p_wxPoint swig_types[126]
+#define SWIGTYPE_p_wxPopupWindow swig_types[127]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[128]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[129]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[130]
+#define SWIGTYPE_p_wxPrintData swig_types[131]
+#define SWIGTYPE_p_wxPrintDialog swig_types[132]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[133]
+#define SWIGTYPE_p_wxPrintPreview swig_types[134]
+#define SWIGTYPE_p_wxPrinter swig_types[135]
+#define SWIGTYPE_p_wxProgressDialog swig_types[136]
+#define SWIGTYPE_p_wxPyApp swig_types[137]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[138]
+#define SWIGTYPE_p_wxPyEvent swig_types[139]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[140]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[141]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[142]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[144]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[145]
+#define SWIGTYPE_p_wxPyPanel swig_types[146]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[147]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[148]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[149]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[150]
+#define SWIGTYPE_p_wxPyPrintout swig_types[151]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[152]
+#define SWIGTYPE_p_wxPySizer swig_types[153]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[154]
+#define SWIGTYPE_p_wxPyVListBox swig_types[155]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPyValidator swig_types[157]
+#define SWIGTYPE_p_wxPyWindow swig_types[158]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[159]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[160]
+#define SWIGTYPE_p_wxSashEvent swig_types[161]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[162]
+#define SWIGTYPE_p_wxSashWindow swig_types[163]
+#define SWIGTYPE_p_wxScrollEvent swig_types[164]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[165]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[166]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[167]
+#define SWIGTYPE_p_wxShowEvent swig_types[168]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[169]
+#define SWIGTYPE_p_wxSize swig_types[170]
+#define SWIGTYPE_p_wxSizeEvent swig_types[171]
+#define SWIGTYPE_p_wxSizer swig_types[172]
+#define SWIGTYPE_p_wxSizerItem swig_types[173]
+#define SWIGTYPE_p_wxSplashScreen swig_types[174]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[175]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[176]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[177]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[178]
+#define SWIGTYPE_p_wxStatusBar swig_types[179]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[180]
+#define SWIGTYPE_p_wxString swig_types[181]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[182]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[183]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[184]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[185]
+#define SWIGTYPE_p_wxTipWindow swig_types[186]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[187]
+#define SWIGTYPE_p_wxTreeCtrl swig_types[188]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[189]
+#define SWIGTYPE_p_wxValidator swig_types[190]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[191]
+#define SWIGTYPE_p_wxWindow swig_types[192]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[193]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[194]
+#define SWIGTYPE_p_wxXPMHandler swig_types[195]
+static swig_type_info *swig_types[197];
+static swig_module_info swig_module = {swig_types, 196, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3070,14 +3071,15 @@ public:
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);

-    DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
+    DEC_PYCALLBACK_BOOL_CELLINTINTME(OnCellClicked);
+

     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);

-IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
+IMP_PYCALLBACK_BOOL_CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);

 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {


@@ -4225,6 +4227,54 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlParser_GetInnerSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
+  wxHtmlTag *arg2 = 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "tag", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlParser_GetInnerSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "1"" of type '" "wxHtmlParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlParser * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlTag,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlTag * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (arg1)->GetInnerSource((wxHtmlTag const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -4418,6 +4468,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWinParser_GetWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
+  wxHtmlWindowInterface *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWinParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWinParser_GetWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWinParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWinParser * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlWindowInterface *)(arg1)->GetWindowInterface();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;


@@ -7150,6 +7228,45 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_GetMouseCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxCursor result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_GetMouseCursor",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetMouseCursor(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7614,6 +7731,66 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_ProcessMouseClick(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxMouseEvent *arg4 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window",(char *) "pos",(char *) "event", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlCell_ProcessMouseClick",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "1"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg4 = reinterpret_cast< wxMouseEvent * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->ProcessMouseClick(arg2,(wxPoint const &)*arg3,(wxMouseEvent const &)*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7825,28 +8002,71 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;

+  wxHtmlCell *arg2 = (wxHtmlCell *) NULL ;

   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "rootCell", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlCell_GetAbsPos",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+    }
+    arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetAbsPos(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCell_GetRootCell(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlCell *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetRootCell" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 

   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxHtmlCell const *)arg1)->GetAbsPos();
+    result = (wxHtmlCell *)((wxHtmlCell const *)arg1)->GetRootCell();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -9078,6 +9298,312 @@ SWIGINTERN PyObject *HtmlFilter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_HtmlWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HtmlWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLWindowTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "title", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLWindowTitle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLWindowTitle" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLWindowTitle((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_HTMLCoordsToWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxPoint result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "cell",(char *) "pos", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlWindowInterface_HTMLCoordsToWindow",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->HTMLCoordsToWindow(arg2,(wxPoint const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)(arg1)->GetHTMLWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->GetHTMLBackgroundColour();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "clr", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundColour((wxColour const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "bmpBg", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundImage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundImage((wxBitmap const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLStatusText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "text", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLStatusText",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLStatusText" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLStatusText((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlWindowInterface_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlWindowInterface, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+

 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -10689,6 +11215,7 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -10739,13 +11266,86 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);
+    result = (bool)(arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindow_OnOpeningURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
+  wxHtmlURLType arg2 ;
+  wxString *arg3 = 0 ;
+  wxString *arg4 = (wxString *) 0 ;
+  wxHtmlOpeningStatus result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool temp3 = false ;
+  bool temp4 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "type",(char *) "url",(char *) "redirect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_OnOpeningURL",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "1"" of type '" "wxPyHtmlWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "2"" of type '" "wxHtmlURLType""'");
+  } 
+  arg2 = static_cast< wxHtmlURLType >(val2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;
+  }
+  {
+    arg4 = wxString_in_helper(obj3);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlOpeningStatus)((wxPyHtmlWindow const *)arg1)->OnOpeningURL(arg2,(wxString const &)*arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
   return NULL;
 }
 


@@ -10783,6 +11383,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWindow_GetDefaultHTMLCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow::HTMLCursor arg1 ;
+  wxCursor result;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "type", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_GetDefaultHTMLCursor",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "HtmlWindow_GetDefaultHTMLCursor" "', expected argument " "1"" of type '" "wxPyHtmlWindow::HTMLCursor""'");
+  } 
+  arg1 = static_cast< wxPyHtmlWindow::HTMLCursor >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxPyHtmlWindow::GetDefaultHTMLCursor(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -16931,6 +17561,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},

+        { (char *)"HtmlParser_GetInnerSource", (PyCFunction) _wrap_HtmlParser_GetInnerSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -16938,6 +17569,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},

+        { (char *)"HtmlWinParser_GetWindowInterface", (PyCFunction)_wrap_HtmlWinParser_GetWindowInterface, METH_O, NULL},

         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},
         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},


@@ -17033,6 +17665,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},

+        { (char *)"HtmlCell_GetMouseCursor", (PyCFunction) _wrap_HtmlCell_GetMouseCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17043,12 +17676,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlCell_ProcessMouseClick", (PyCFunction) _wrap_HtmlCell_ProcessMouseClick, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"HtmlCell_GetAbsPos", (PyCFunction)_wrap_HtmlCell_GetAbsPos, METH_O, NULL},
+        { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCell_GetRootCell", (PyCFunction)_wrap_HtmlCell_GetRootCell, METH_O, NULL},

         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},


@@ -17094,6 +17729,15 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_HtmlWindowInterface", (PyCFunction)_wrap_delete_HtmlWindowInterface, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLWindowTitle", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLWindowTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_HTMLCoordsToWindow", (PyCFunction) _wrap_HtmlWindowInterface_HTMLCoordsToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLWindow", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLWindow, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLBackgroundColour", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLBackgroundColour, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundColour", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundImage", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLStatusText", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLStatusText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_swigregister", HtmlWindowInterface_swigregister, METH_VARARGS, NULL},

         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17133,7 +17777,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_OnOpeningURL", (PyCFunction) _wrap_HtmlWindow_OnOpeningURL, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_GetDefaultHTMLCursor", (PyCFunction) _wrap_HtmlWindow_GetDefaultHTMLCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},


@@ -18578,6 +19224,7 @@ static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHt
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};


@@ -18726,6 +19373,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,

+  &_swigt__p_wxHtmlWindowInterface,

   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,


@@ -18972,6 +19620,7 @@ static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidget
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -19120,6 +19769,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,

+  _swigc__p_wxHtmlWindowInterface,

   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,


@@ -19779,6 +20429,12 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));

+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Text)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Text)));

   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));
   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));

diff --git a/wxPython/src/msw/_controls.py b/wxPython/src/msw/_controls.py
index 703e56d137b780e24ecb5a316f0042202adaea00..828507023ad5ea4c9bc4babd54dd5d52b70752a1 100644 (file)
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -860,7 +860,7 @@ def ComboBox_GetClassDefaultAttributes(*args, **kwargs):
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH
 GA_HORIZONTAL = _controls_.GA_HORIZONTAL
 GA_VERTICAL = _controls_.GA_VERTICAL
 GA_SMOOTH = _controls_.GA_SMOOTH

-GA_PROGRESSBAR = _controls_.GA_PROGRESSBAR
+GA_PROGRESSBAR = 0 # obsolete 

 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class Gauge(_core.Control):
     """Proxy of C++ Gauge class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -1491,9 +1491,9 @@ TE_DONTWRAP = _controls_.TE_DONTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP
 TE_CHARWRAP = _controls_.TE_CHARWRAP
 TE_WORDWRAP = _controls_.TE_WORDWRAP
 TE_BESTWRAP = _controls_.TE_BESTWRAP

-TE_LINEWRAP = _controls_.TE_LINEWRAP

 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE
 TE_RICH2 = _controls_.TE_RICH2
 TE_CAPITALIZE = _controls_.TE_CAPITALIZE

+TE_LINEWRAP = TE_CHARWRAP 

 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE
 TEXT_ALIGNMENT_DEFAULT = _controls_.TEXT_ALIGNMENT_DEFAULT
 TEXT_ALIGNMENT_LEFT = _controls_.TEXT_ALIGNMENT_LEFT
 TEXT_ALIGNMENT_CENTRE = _controls_.TEXT_ALIGNMENT_CENTRE


@@ -2762,6 +2762,7 @@ BK_BOTTOM = _controls_.BK_BOTTOM
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK
 BK_LEFT = _controls_.BK_LEFT
 BK_RIGHT = _controls_.BK_RIGHT
 BK_ALIGN_MASK = _controls_.BK_ALIGN_MASK

+BK_BUTTONBAR = _controls_.BK_BUTTONBAR

 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
 class BookCtrlBase(_core.Control):
     """Proxy of C++ BookCtrlBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')


@@ -2820,17 +2821,25 @@ class BookCtrlBase(_core.Control):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_CalcSizeFromPage(*args, **kwargs)
 
     def GetInternalBorder(*args, **kwargs):

-        """GetInternalBorder(self) -> size_t"""
+        """GetInternalBorder(self) -> unsigned int"""

         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):
         return _controls_.BookCtrlBase_GetInternalBorder(*args, **kwargs)
 
     def SetInternalBorder(*args, **kwargs):

-        """SetInternalBorder(self, size_t internalBorder)"""
+        """SetInternalBorder(self, unsigned int internalBorder)"""

         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 
         return _controls_.BookCtrlBase_SetInternalBorder(*args, **kwargs)
 
     def IsVertical(*args, **kwargs):
         """IsVertical(self) -> bool"""
         return _controls_.BookCtrlBase_IsVertical(*args, **kwargs)
 

+    def SetControlMargin(*args, **kwargs):
+        """SetControlMargin(self, int margin)"""
+        return _controls_.BookCtrlBase_SetControlMargin(*args, **kwargs)
+
+    def GetControlMargin(*args, **kwargs):
+        """GetControlMargin(self) -> int"""
+        return _controls_.BookCtrlBase_GetControlMargin(*args, **kwargs)
+

     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)
     def SetFitToCurrentPage(*args, **kwargs):
         """SetFitToCurrentPage(self, bool fit)"""
         return _controls_.BookCtrlBase_SetFitToCurrentPage(*args, **kwargs)


@@ -2839,6 +2848,10 @@ class BookCtrlBase(_core.Control):
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 
         """GetFitToCurrentPage(self) -> bool"""
         return _controls_.BookCtrlBase_GetFitToCurrentPage(*args, **kwargs)
 

+    def GetControlSizer(*args, **kwargs):
+        """GetControlSizer(self) -> Sizer"""
+        return _controls_.BookCtrlBase_GetControlSizer(*args, **kwargs)
+

     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)
     def DeletePage(*args, **kwargs):
         """DeletePage(self, size_t n) -> bool"""
         return _controls_.BookCtrlBase_DeletePage(*args, **kwargs)


@@ -3832,10 +3845,6 @@ class ToolBar(ToolBarBase):
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 
         """
         return _controls_.ToolBar_Create(*args, **kwargs)
 

-    def FindToolForPosition(*args, **kwargs):
-        """FindToolForPosition(self, int x, int y) -> ToolBarToolBase"""
-        return _controls_.ToolBar_FindToolForPosition(*args, **kwargs)
-

     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
     def GetClassDefaultAttributes(*args, **kwargs):
         """
         GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes


@@ -4407,6 +4416,7 @@ class ListCtrl(_core.Control):
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 
         """GetItemSpacing(self) -> Size"""
         return _controls_.ListCtrl_GetItemSpacing(*args, **kwargs)
 

+    GetItemSpacing = wx._deprecated(GetItemSpacing) 

     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)
     def GetSelectedItemCount(*args, **kwargs):
         """GetSelectedItemCount(self) -> int"""
         return _controls_.ListCtrl_GetSelectedItemCount(*args, **kwargs)


@@ -4767,8 +4777,10 @@ TR_ROW_LINES = _controls_.TR_ROW_LINES
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS
 TR_FULL_ROW_HIGHLIGHT = _controls_.TR_FULL_ROW_HIGHLIGHT
 TR_DEFAULT_STYLE = _controls_.TR_DEFAULT_STYLE
 TR_TWIST_BUTTONS = _controls_.TR_TWIST_BUTTONS

-TR_MAC_BUTTONS = _controls_.TR_MAC_BUTTONS
-TR_AQUA_BUTTONS = _controls_.TR_AQUA_BUTTONS
+# obsolete
+TR_MAC_BUTTONS = 0
+wxTR_AQUA_BUTTONS = 0
+

 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded
 TreeItemIcon_Normal = _controls_.TreeItemIcon_Normal
 TreeItemIcon_Selected = _controls_.TreeItemIcon_Selected
 TreeItemIcon_Expanded = _controls_.TreeItemIcon_Expanded


@@ -4999,7 +5011,7 @@ class TreeCtrl(_core.Control):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):
         return _controls_.TreeCtrl__setCallbackInfo(*args, **kwargs)
 
     def GetCount(*args, **kwargs):

-        """GetCount(self) -> size_t"""
+        """GetCount(self) -> unsigned int"""

         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):
         return _controls_.TreeCtrl_GetCount(*args, **kwargs)
 
     def GetIndent(*args, **kwargs):

diff --git a/wxPython/src/msw/_controls_wrap.cpp b/wxPython/src/msw/_controls_wrap.cpp
index b7737a4a9d318fc02933240759878aeb9c1fb9bd..f50735791351b96e98dc1adee96d8dcdf6106d89 100644 (file)
--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
@@ -2807,14 +2807,15 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>
  static const wxString wxPyStaticTextNameStr(wxStaticTextNameStr); 
 
 #include <wx/checklst.h>

-    

 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){
 
  static const wxString wxPyListBoxNameStr(wxListBoxNameStr); 
 SWIGINTERN void wxListBox_Insert(wxListBox *self,wxString const &item,int pos,PyObject *clientData=NULL){

-            if (clientData) {
+            if (clientData)
+            {

                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);
                 wxPyClientData* data = new wxPyClientData(clientData);
                 self->Insert(item, pos, data);

-            } else
+            }
+            else

                 self->Insert(item, pos);
         }
 
                 self->Insert(item, pos);
         }
 


@@ -2847,12 +2848,15 @@ SWIG_AsVal_unsigned_SS_int (PyObject * obj, unsigned int *val)
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){
 }
 
 SWIGINTERN PyObject *wxListBox_GetSelections(wxListBox *self){

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();

             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());
             wxArrayInt lst;
             self->GetSelections(lst);
             PyObject *tup = PyTuple_New(lst.GetCount());

-            for(size_t i=0; i<lst.GetCount(); i++) {
+            for (size_t i=0; i<lst.GetCount(); i++)
+            {

                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }
                 PyTuple_SetItem(tup, i, PyInt_FromLong(lst[i]));
             }

+            wxPyEndBlockThreads(blocked);

             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){
             return tup;
         }
 SWIGINTERN void wxListBox_SetItemForegroundColour(wxListBox *self,int item,wxColour const &c){


@@ -19292,7 +19296,7 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -19306,11 +19310,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetInternalBorder(PyObject *SWIGUNUSEDPA
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxBookCtrlBase const *)arg1)->GetInternalBorder();
+    result = (unsigned int)((wxBookCtrlBase const *)arg1)->GetInternalBorder();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -19320,10 +19324,10 @@ fail:
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;

-  size_t arg2 ;
+  unsigned int arg2 ;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  size_t val2 ;
+  unsigned int val2 ;

   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   int ecode2 = 0 ;
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;


@@ -19337,11 +19341,11 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_SetInternalBorder(PyObject *SWIGUNUSEDPA
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
   }
   arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);

-  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  ecode2 = SWIG_AsVal_unsigned_SS_int(obj1, &val2);

   if (!SWIG_IsOK(ecode2)) {
   if (!SWIG_IsOK(ecode2)) {

-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "size_t""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetInternalBorder" "', expected argument " "2"" of type '" "unsigned int""'");

   } 
   } 

-  arg2 = static_cast< size_t >(val2);
+  arg2 = static_cast< unsigned int >(val2);

   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetInternalBorder(arg2);


@@ -19385,6 +19389,72 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_SetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "margin", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:BookCtrlBase_SetControlMargin",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "BookCtrlBase_SetControlMargin" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetControlMargin(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlMargin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlMargin" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxBookCtrlBase const *)arg1)->GetControlMargin();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_SetFitToCurrentPage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -19453,6 +19523,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_BookCtrlBase_GetControlSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
+  wxSizer *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxBookCtrlBase, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "BookCtrlBase_GetControlSizer" "', expected argument " "1"" of type '" "wxBookCtrlBase const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxBookCtrlBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxSizer *)((wxBookCtrlBase const *)arg1)->GetControlSizer();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;
 SWIGINTERN PyObject *_wrap_BookCtrlBase_DeletePage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxBookCtrlBase *arg1 = (wxBookCtrlBase *) 0 ;


@@ -25386,56 +25486,6 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_ToolBar_FindToolForPosition(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxToolBar *arg1 = (wxToolBar *) 0 ;
-  int arg2 ;
-  int arg3 ;
-  wxToolBarToolBase *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int val2 ;
-  int ecode2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:ToolBar_FindToolForPosition",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxToolBar, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "1"" of type '" "wxToolBar *""'"); 
-  }
-  arg1 = reinterpret_cast< wxToolBar * >(argp1);
-  ecode2 = SWIG_AsVal_int(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "2"" of type '" "int""'");
-  } 
-  arg2 = static_cast< int >(val2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ToolBar_FindToolForPosition" "', expected argument " "3"" of type '" "int""'");
-  } 
-  arg3 = static_cast< int >(val3);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxToolBarToolBase *)(arg1)->FindToolForPosition(arg2,arg3);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, (bool)0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-

 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;
 SWIGINTERN PyObject *_wrap_ToolBar_GetClassDefaultAttributes(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindowVariant arg1 = (wxWindowVariant) wxWINDOW_VARIANT_NORMAL ;


@@ -33385,7 +33435,7 @@ fail:
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;
 SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxPyTreeCtrl *arg1 = (wxPyTreeCtrl *) 0 ;

-  size_t result;
+  unsigned int result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;


@@ -33399,11 +33449,11 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetCount(PyObject *SWIGUNUSEDPARM(self), PyO
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg1 = reinterpret_cast< wxPyTreeCtrl * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = (size_t)((wxPyTreeCtrl const *)arg1)->GetCount();
+    result = (unsigned int)((wxPyTreeCtrl const *)arg1)->GetCount();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  resultobj = SWIG_From_unsigned_SS_int(static_cast< unsigned int >(result));

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -41241,8 +41291,11 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},
         { (char *)"BookCtrlBase_GetInternalBorder", (PyCFunction)_wrap_BookCtrlBase_GetInternalBorder, METH_O, NULL},
         { (char *)"BookCtrlBase_SetInternalBorder", (PyCFunction) _wrap_BookCtrlBase_SetInternalBorder, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_IsVertical", (PyCFunction)_wrap_BookCtrlBase_IsVertical, METH_O, NULL},

+        { (char *)"BookCtrlBase_SetControlMargin", (PyCFunction) _wrap_BookCtrlBase_SetControlMargin, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"BookCtrlBase_GetControlMargin", (PyCFunction)_wrap_BookCtrlBase_GetControlMargin, METH_O, NULL},

         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},
         { (char *)"BookCtrlBase_SetFitToCurrentPage", (PyCFunction) _wrap_BookCtrlBase_SetFitToCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_GetFitToCurrentPage", (PyCFunction)_wrap_BookCtrlBase_GetFitToCurrentPage, METH_O, NULL},

+        { (char *)"BookCtrlBase_GetControlSizer", (PyCFunction)_wrap_BookCtrlBase_GetControlSizer, METH_O, NULL},

         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},
         { (char *)"BookCtrlBase_DeletePage", (PyCFunction) _wrap_BookCtrlBase_DeletePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_RemovePage", (PyCFunction) _wrap_BookCtrlBase_RemovePage, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"BookCtrlBase_DeleteAllPages", (PyCFunction)_wrap_BookCtrlBase_DeleteAllPages, METH_O, NULL},


@@ -41395,7 +41448,6 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_ToolBar", (PyCFunction) _wrap_new_ToolBar, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreToolBar", (PyCFunction)_wrap_new_PreToolBar, METH_NOARGS, NULL},
         { (char *)"ToolBar_Create", (PyCFunction) _wrap_ToolBar_Create, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"ToolBar_FindToolForPosition", (PyCFunction) _wrap_ToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},
         { (char *)"ToolBar_GetClassDefaultAttributes", (PyCFunction) _wrap_ToolBar_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"ToolBar_swigregister", ToolBar_swigregister, METH_VARARGS, NULL},
         { (char *)"ToolBar_swiginit", ToolBar_swiginit, METH_VARARGS, NULL},


@@ -44055,7 +44107,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));
   SWIG_Python_SetConstant(d, "GA_HORIZONTAL",SWIG_From_int(static_cast< int >(wxGA_HORIZONTAL)));
   SWIG_Python_SetConstant(d, "GA_VERTICAL",SWIG_From_int(static_cast< int >(wxGA_VERTICAL)));
   SWIG_Python_SetConstant(d, "GA_SMOOTH",SWIG_From_int(static_cast< int >(wxGA_SMOOTH)));

-  SWIG_Python_SetConstant(d, "GA_PROGRESSBAR",SWIG_From_int(static_cast< int >(wxGA_PROGRESSBAR)));

   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBitmapNameStr",StaticBitmapNameStr_get, StaticBitmapNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticBoxNameStr",StaticBoxNameStr_get, StaticBoxNameStr_set);
   SWIG_addvarlink(SWIG_globals(),(char*)"StaticTextNameStr",StaticTextNameStr_get, StaticTextNameStr_set);


@@ -44079,7 +44130,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));
   SWIG_Python_SetConstant(d, "TE_CHARWRAP",SWIG_From_int(static_cast< int >(wxTE_CHARWRAP)));
   SWIG_Python_SetConstant(d, "TE_WORDWRAP",SWIG_From_int(static_cast< int >(wxTE_WORDWRAP)));
   SWIG_Python_SetConstant(d, "TE_BESTWRAP",SWIG_From_int(static_cast< int >(wxTE_BESTWRAP)));

-  SWIG_Python_SetConstant(d, "TE_LINEWRAP",SWIG_From_int(static_cast< int >(wxTE_LINEWRAP)));

   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));
   SWIG_Python_SetConstant(d, "TE_RICH2",SWIG_From_int(static_cast< int >(wxTE_RICH2)));
   SWIG_Python_SetConstant(d, "TE_CAPITALIZE",SWIG_From_int(static_cast< int >(wxTE_CAPITALIZE)));
   SWIG_Python_SetConstant(d, "TEXT_ALIGNMENT_DEFAULT",SWIG_From_int(static_cast< int >(wxTEXT_ALIGNMENT_DEFAULT)));


@@ -44143,6 +44193,7 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));
   SWIG_Python_SetConstant(d, "BK_LEFT",SWIG_From_int(static_cast< int >(wxBK_LEFT)));
   SWIG_Python_SetConstant(d, "BK_RIGHT",SWIG_From_int(static_cast< int >(wxBK_RIGHT)));
   SWIG_Python_SetConstant(d, "BK_ALIGN_MASK",SWIG_From_int(static_cast< int >(wxBK_ALIGN_MASK)));

+  SWIG_Python_SetConstant(d, "BK_BUTTONBAR",SWIG_From_int(static_cast< int >(wxBK_BUTTONBAR)));

   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));
   SWIG_Python_SetConstant(d, "NB_FIXEDWIDTH",SWIG_From_int(static_cast< int >(wxNB_FIXEDWIDTH)));
   SWIG_Python_SetConstant(d, "NB_TOP",SWIG_From_int(static_cast< int >(wxNB_TOP)));
   SWIG_Python_SetConstant(d, "NB_LEFT",SWIG_From_int(static_cast< int >(wxNB_LEFT)));


@@ -44300,8 +44351,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));
   SWIG_Python_SetConstant(d, "TR_FULL_ROW_HIGHLIGHT",SWIG_From_int(static_cast< int >(wxTR_FULL_ROW_HIGHLIGHT)));
   SWIG_Python_SetConstant(d, "TR_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxTR_DEFAULT_STYLE)));
   SWIG_Python_SetConstant(d, "TR_TWIST_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_TWIST_BUTTONS)));

-  SWIG_Python_SetConstant(d, "TR_MAC_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_MAC_BUTTONS)));
-  SWIG_Python_SetConstant(d, "TR_AQUA_BUTTONS",SWIG_From_int(static_cast< int >(wxTR_AQUA_BUTTONS)));

   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Normal",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Normal)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Selected",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Selected)));
   SWIG_Python_SetConstant(d, "TreeItemIcon_Expanded",SWIG_From_int(static_cast< int >(wxTreeItemIcon_Expanded)));

diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py
index 64c546c016eac49672cbd445613ace2820e1ad22..3e27d149f330dd94c53ba310c74a9b8862fb353a 100644 (file)
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -133,6 +133,8 @@ SB_VERTICAL = _core_.SB_VERTICAL
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE
 RB_USE_CHECKBOX = _core_.RB_USE_CHECKBOX
 ST_SIZEGRIP = _core_.ST_SIZEGRIP
 ST_NO_AUTORESIZE = _core_.ST_NO_AUTORESIZE

+ST_DOTS_MIDDLE = _core_.ST_DOTS_MIDDLE
+ST_DOTS_END = _core_.ST_DOTS_END

 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE
 FLOOD_SURFACE = _core_.FLOOD_SURFACE
 FLOOD_BORDER = _core_.FLOOD_BORDER
 ODDEVEN_RULE = _core_.ODDEVEN_RULE


@@ -804,7 +806,7 @@ class Size(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Size sz) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Size objects.
         """
 
         Test for equality of wx.Size objects.
         """


@@ -812,9 +814,9 @@ class Size(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Size sz) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Size objects.

         """
         return _core_.Size___ne__(*args, **kwargs)
 
         """
         return _core_.Size___ne__(*args, **kwargs)
 


@@ -940,7 +942,7 @@ class RealPoint(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, RealPoint pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.RealPoint objects.
         """
 
         Test for equality of wx.RealPoint objects.
         """


@@ -948,7 +950,7 @@ class RealPoint(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, RealPoint pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.RealPoint objects.
         """
 
         Test for inequality of wx.RealPoint objects.
         """


@@ -1025,7 +1027,7 @@ class Point(object):
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
         Test for equality of wx.Point objects.
         """
 
         Test for equality of wx.Point objects.
         """


@@ -1033,7 +1035,7 @@ class Point(object):
 
     def __ne__(*args, **kwargs):
         """
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
         Test for inequality of wx.Point objects.
         """
 
         Test for inequality of wx.Point objects.
         """


@@ -1316,17 +1318,17 @@ class Rect(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Rect rect) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality.
+        Test for equality of wx.Rect objects.

         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Rect___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Rect rect) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality.
+        Test for inequality of wx.Rect objects.

         """
         return _core_.Rect___ne__(*args, **kwargs)
 
         """
         return _core_.Rect___ne__(*args, **kwargs)
 


@@ -1533,17 +1535,17 @@ class Point2D(object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Point2D pt) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Test for equality
+        Test for equality of wx.Point2D objects.

         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _core_.Point2D___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Point2D pt) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Test for inequality
+        Test for inequality of wx.Point2D objects.

         """
         return _core_.Point2D___ne__(*args, **kwargs)
 
         """
         return _core_.Point2D___ne__(*args, **kwargs)
 


@@ -11941,11 +11943,19 @@ class GBPosition(object):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBPosition_SetCol(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBPosition other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare GBPosition for equality.
+        """

         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBPosition___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBPosition other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBPosition for inequality.
+        """

         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBPosition___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):


@@ -12014,11 +12024,19 @@ class GBSpan(object):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _core_.GBSpan_SetColspan(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GBSpan other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Compare wxGBSpan for equality.
+        """

         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _core_.GBSpan___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GBSpan other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Compare GBSpan for inequality.
+        """

         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):
         return _core_.GBSpan___ne__(*args, **kwargs)
 
     def Set(*args, **kwargs):

diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp
index 3b971648791eea140a464fd746f102e8b6eeb00a..d02babcfb681610c738aad78010f89c7192b6577 100644 (file)
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -2953,6 +2953,24 @@ SWIG_AsVal_int (PyObject * obj, int *val)
   return res;
 }
 
   return res;
 }
 

+SWIGINTERN bool wxSize___eq__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxSize_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxSize___ne__(wxSize *self,PyObject *other){
+            wxSize  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxSize_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);
 SWIGINTERN PyObject *wxSize_Get(wxSize *self){
             wxPyBlock_t blocked = wxPyBeginBlockThreads();
             PyObject* tup = PyTuple_New(2);


@@ -2975,6 +2993,24 @@ SWIG_AsVal_double (PyObject *obj, double* val)
 
   #define SWIG_From_double   PyFloat_FromDouble 
 
 
   #define SWIG_From_double   PyFloat_FromDouble 
 

+SWIGINTERN bool wxRealPoint___eq__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRealPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRealPoint___ne__(wxRealPoint *self,PyObject *other){
+            wxRealPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRealPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRealPoint_Set(wxRealPoint *self,double x,double y){
             self->x = x;
             self->y = y;


@@ -2987,6 +3023,24 @@ SWIGINTERN PyObject *wxRealPoint_Get(wxRealPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxPoint___eq__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint___ne__(wxPoint *self,PyObject *other){
+            wxPoint  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxPoint_Set(wxPoint *self,long x,long y){
             self->x = x;
             self->y = y;


@@ -2999,6 +3053,24 @@ SWIGINTERN PyObject *wxPoint_Get(wxPoint *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxRect___eq__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxRect_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxRect___ne__(wxRect *self,PyObject *other){
+            wxRect  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxRect_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;
 SWIGINTERN void wxRect_Set(wxRect *self,int x=0,int y=0,int width=0,int height=0){
             self->x = x;
             self->y = y;


@@ -3036,6 +3108,24 @@ SWIGINTERN PyObject *wxRect_Get(wxRect *self){
         return Py_None;
     }
 
         return Py_None;
     }
 

+SWIGINTERN bool wxPoint2D___eq__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxPoint2D_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxPoint2D___ne__(wxPoint2D *self,PyObject *other){
+            wxPoint2D  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxPoint2D_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;
 SWIGINTERN void wxPoint2D_Set(wxPoint2D *self,double x=0,double y=0){
             self->m_x = x;
             self->m_y = y;


@@ -4133,6 +4223,24 @@ bool wxGBSpan_helper(PyObject* source, wxGBSpan** obj)
 }
 
 
 }
 
 

+SWIGINTERN bool wxGBPosition___eq__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBPosition_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBPosition___ne__(wxGBPosition *self,PyObject *other){
+            wxGBPosition  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBPosition_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);
 SWIGINTERN void wxGBPosition_Set(wxGBPosition *self,int row=0,int col=0){
             self->SetRow(row);
             self->SetCol(col);


@@ -4145,6 +4253,24 @@ SWIGINTERN PyObject *wxGBPosition_Get(wxGBPosition *self){
             wxPyEndBlockThreads(blocked);
             return tup;
         }
             wxPyEndBlockThreads(blocked);
             return tup;
         }

+SWIGINTERN bool wxGBSpan___eq__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGBSpan_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGBSpan___ne__(wxGBSpan *self,PyObject *other){
+            wxGBSpan  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGBSpan_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);
 SWIGINTERN void wxGBSpan_Set(wxGBSpan *self,int rowspan=1,int colspan=1){
             self->SetRowspan(rowspan);
             self->SetColspan(colspan);


@@ -4483,15 +4609,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4500,14 +4625,9 @@ SWIGINTERN PyObject *_wrap_Size___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___eq__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -4522,15 +4642,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;
 SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxSize *arg1 = (wxSize *) 0 ;

-  wxSize *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxSize temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "sz", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Size___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -4539,14 +4658,9 @@ SWIGINTERN PyObject *_wrap_Size___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Size___ne__" "', expected argument " "1"" of type '" "wxSize *""'"); 
   }
   arg1 = reinterpret_cast< wxSize * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxSize_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxSize const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxSize___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5168,15 +5282,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5185,14 +5298,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___eq__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5207,15 +5315,14 @@ fail:
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRealPoint *arg1 = (wxRealPoint *) 0 ;

-  wxRealPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRealPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:RealPoint___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5224,14 +5331,9 @@ SWIGINTERN PyObject *_wrap_RealPoint___ne__(PyObject *SWIGUNUSEDPARM(self), PyOb
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RealPoint___ne__" "', expected argument " "1"" of type '" "wxRealPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxRealPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRealPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxRealPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRealPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5583,15 +5685,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___eq__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5600,14 +5701,9 @@ SWIGINTERN PyObject *_wrap_Point___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___eq__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -5622,15 +5718,14 @@ fail:
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;
 SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint *arg1 = (wxPoint *) 0 ;

-  wxPoint *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point___ne__",kwnames,&obj0,&obj1)) SWIG_fail;


@@ -5639,14 +5734,9 @@ SWIGINTERN PyObject *_wrap_Point___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point___ne__" "', expected argument " "1"" of type '" "wxPoint *""'"); 
   }
   arg1 = reinterpret_cast< wxPoint * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxPoint const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7242,31 +7332,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___eq__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator ==((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -7281,31 +7365,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;
 SWIGINTERN PyObject *_wrap_Rect___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxRect *arg1 = (wxRect *) 0 ;

-  wxRect *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxRect temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "rect", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Rect___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxRect, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Rect___ne__" "', expected argument " "1"" of type '" "wxRect *""'"); 

   }
   arg1 = reinterpret_cast< wxRect * >(argp1);
   }
   arg1 = reinterpret_cast< wxRect * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxRect_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxRect const *)arg1)->operator !=((wxRect const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxRect___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8521,31 +8599,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___eq__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator ==((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -8560,31 +8632,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;
 SWIGINTERN PyObject *_wrap_Point2D___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxPoint2D *arg1 = (wxPoint2D *) 0 ;

-  wxPoint2D *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxPoint2D temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "pt", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Point2D___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPoint2D, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Point2D___ne__" "', expected argument " "1"" of type '" "wxPoint2D *""'"); 

   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);
   }
   arg1 = reinterpret_cast< wxPoint2D * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxPoint2D_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxPoint2D const *)arg1)->operator !=((wxPoint2D const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxPoint2D___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48691,11 +48757,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48708,14 +48773,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___eq__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___eq__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -48730,11 +48790,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;
 SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBPosition *arg1 = (wxGBPosition *) 0 ;

-  wxGBPosition *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBPosition temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -48747,14 +48806,9 @@ SWIGINTERN PyObject *_wrap_GBPosition___ne__(PyObject *SWIGUNUSEDPARM(self), PyO
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBPosition___ne__" "', expected argument " "1"" of type '" "wxGBPosition *""'"); 
   }
   arg1 = reinterpret_cast< wxGBPosition * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBPosition_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBPosition const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBPosition___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49062,11 +49116,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49079,14 +49132,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___eq__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___eq__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator ==((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -49101,11 +49149,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;
 SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGBSpan *arg1 = (wxGBSpan *) 0 ;

-  wxGBSpan *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGBSpan temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -49118,14 +49165,9 @@ SWIGINTERN PyObject *_wrap_GBSpan___ne__(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GBSpan___ne__" "', expected argument " "1"" of type '" "wxGBSpan *""'"); 
   }
   arg1 = reinterpret_cast< wxGBSpan * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxGBSpan_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->operator !=((wxGBSpan const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGBSpan___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -55426,6 +55468,8 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));
   SWIG_Python_SetConstant(d, "RB_USE_CHECKBOX",SWIG_From_int(static_cast< int >(wxRB_USE_CHECKBOX)));
   SWIG_Python_SetConstant(d, "ST_SIZEGRIP",SWIG_From_int(static_cast< int >(wxST_SIZEGRIP)));
   SWIG_Python_SetConstant(d, "ST_NO_AUTORESIZE",SWIG_From_int(static_cast< int >(wxST_NO_AUTORESIZE)));

+  SWIG_Python_SetConstant(d, "ST_DOTS_MIDDLE",SWIG_From_int(static_cast< int >(wxST_DOTS_MIDDLE)));
+  SWIG_Python_SetConstant(d, "ST_DOTS_END",SWIG_From_int(static_cast< int >(wxST_DOTS_END)));

   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));
   SWIG_Python_SetConstant(d, "FLOOD_SURFACE",SWIG_From_int(static_cast< int >(wxFLOOD_SURFACE)));
   SWIG_Python_SetConstant(d, "FLOOD_BORDER",SWIG_From_int(static_cast< int >(wxFLOOD_BORDER)));
   SWIG_Python_SetConstant(d, "ODDEVEN_RULE",SWIG_From_int(static_cast< int >(wxODDEVEN_RULE)));

diff --git a/wxPython/src/msw/_gdi.py b/wxPython/src/msw/_gdi.py
index 2dd0e5b7fff72226bee7698787280f07ffc27a46..ae99099b88f19dba15e084f65c32759ced11a02d 100644 (file)
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -188,17 +188,17 @@ class Colour(_core.Object):
 
     def __eq__(*args, **kwargs):
         """
 
     def __eq__(*args, **kwargs):
         """

-        __eq__(self, Colour colour) -> bool
+        __eq__(self, PyObject other) -> bool

 
 

-        Compare colours for equality
+        Compare colours for equality.

         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """
         """
         return _gdi_.Colour___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         """

-        __ne__(self, Colour colour) -> bool
+        __ne__(self, PyObject other) -> bool

 
 

-        Compare colours for inequality
+        Compare colours for inequality.

         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 
         """
         return _gdi_.Colour___ne__(*args, **kwargs)
 

diff --git a/wxPython/src/msw/_gdi_wrap.cpp b/wxPython/src/msw/_gdi_wrap.cpp
index c6e99b83d9bf01a92595a978f608f0aced78ddf0..3ad558d63c3e87d79c65886f99b101b43e8a3673 100644 (file)
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -2786,6 +2786,24 @@ SWIG_From_unsigned_SS_char  (unsigned char value)
   return SWIG_From_unsigned_SS_long  (value);
 }
 
   return SWIG_From_unsigned_SS_long  (value);
 }
 

+SWIGINTERN bool wxColour___eq__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxColour_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxColour___ne__(wxColour *self,PyObject *other){
+            wxColour  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxColour_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;
 SWIGINTERN PyObject *wxColour_Get(wxColour *self){
             PyObject* rv = PyTuple_New(3);
             int red = -1;


@@ -3057,18 +3075,26 @@ IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEnc
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
 
 
 SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetEncodings();
             wxArrayString* arr = self->GetEncodings();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret = PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
         }
 SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){

+            PyObject* ret;

             wxArrayString* arr = self->GetFacenames();
             wxArrayString* arr = self->GetFacenames();

+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            

             if (arr)
             if (arr)

-                return wxArrayString2PyList_helper(*arr);
+                ret = wxArrayString2PyList_helper(*arr);

             else
             else

-                return PyList_New(0);
+                ret =  PyList_New(0);
+            wxPyEndBlockThreads(blocked);
+            return ret;

         }
 
 #include <locale.h>
         }
 
 #include <locale.h>


@@ -3801,31 +3827,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___eq__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator ==((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -3840,31 +3860,25 @@ fail:
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;
 SWIGINTERN PyObject *_wrap_Colour___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxColour *arg1 = (wxColour *) 0 ;

-  wxColour *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxColour temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {

-    (char *) "self",(char *) "colour", NULL 
+    (char *) "self",(char *) "other", NULL 

   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   };
   
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Colour___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxColour, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Colour___ne__" "', expected argument " "1"" of type '" "wxColour *""'"); 

   }
   arg1 = reinterpret_cast< wxColour * >(argp1);
   }
   arg1 = reinterpret_cast< wxColour * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxColour const *)arg1)->operator !=((wxColour const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxColour___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {

diff --git a/wxPython/src/msw/_misc.py b/wxPython/src/msw/_misc.py
index 102db9c4a95a67dc867bf00fdfc3369f35b02832..01505bf8b0dd698836b9e8edd4590b10fab2787a 100644 (file)
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -313,6 +313,7 @@ def EndBusyCursor(*args):
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)
 def GetElapsedTime(*args, **kwargs):
   """GetElapsedTime(bool resetTimer=True) -> long"""
   return _misc_.GetElapsedTime(*args, **kwargs)

+GetElapsedTime = wx._deprecated(GetElapsedTime) 

 
 def IsBusy(*args):
   """IsBusy() -> bool"""
 
 def IsBusy(*args):
   """IsBusy() -> bool"""


@@ -3834,6 +3835,16 @@ class TimeSpan(object):
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
     """Proxy of C++ TimeSpan class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr

+    def Milliseconds(*args, **kwargs):
+        """Milliseconds(long ms) -> TimeSpan"""
+        return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+    Milliseconds = staticmethod(Milliseconds)
+    def Millisecond(*args, **kwargs):
+        """Millisecond() -> TimeSpan"""
+        return _misc_.TimeSpan_Millisecond(*args, **kwargs)
+
+    Millisecond = staticmethod(Millisecond)

     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)
     def Seconds(*args, **kwargs):
         """Seconds(long sec) -> TimeSpan"""
         return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4026,6 +4037,14 @@ class TimeSpan(object):
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 
 TimeSpan_swigregister = _misc_.TimeSpan_swigregister
 TimeSpan_swigregister(TimeSpan)
 

+def TimeSpan_Milliseconds(*args, **kwargs):
+  """TimeSpan_Milliseconds(long ms) -> TimeSpan"""
+  return _misc_.TimeSpan_Milliseconds(*args, **kwargs)
+
+def TimeSpan_Millisecond(*args):
+  """TimeSpan_Millisecond() -> TimeSpan"""
+  return _misc_.TimeSpan_Millisecond(*args)
+

 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)
 def TimeSpan_Seconds(*args, **kwargs):
   """TimeSpan_Seconds(long sec) -> TimeSpan"""
   return _misc_.TimeSpan_Seconds(*args, **kwargs)


@@ -4595,6 +4614,17 @@ class DataObjectComposite(DataObject):
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 
         """
         return _misc_.DataObjectComposite_Add(*args, **kwargs)
 

+    def GetReceivedFormat(*args, **kwargs):
+        """
+        GetReceivedFormat(self) -> DataFormat
+
+        Report the format passed to the `SetData` method.  This should be the
+        format of the data object within the composite that recieved data from
+        the clipboard or the DnD operation.  You can use this method to find
+        out what kind of data object was recieved.
+        """
+        return _misc_.DataObjectComposite_GetReceivedFormat(*args, **kwargs)
+

 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 
 DataObjectComposite_swigregister = _misc_.DataObjectComposite_swigregister
 DataObjectComposite_swigregister(DataObjectComposite)
 


@@ -5624,14 +5654,13 @@ def Display_GetFromWindow(*args, **kwargs):
 
 class StandardPaths(object):
     """
 
 class StandardPaths(object):
     """

-    wx.StandardPaths returns the standard locations in the file system and
-    should be used by the programs to find their data files in a portable
-    way.
+    wx.StandardPaths returns standard locations in the file system and
+    should be used by programs to find their data files in a portable way.

 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note
 
     In the description of the methods below, the example return values are
     given for the Unix, Windows and Mac OS X systems, however please note

-    that these are just the examples and the actual values may differ. For
-    example, under Windows: the system administrator may change the
+    that these are just  examples and the actual values may differ. For
+    example, under Windows the system administrator may change the

     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 
     standard directories locations, i.e. the Windows directory may be
     named W:\Win2003 instead of the default C:\Windows.
 


@@ -5642,7 +5671,7 @@ class StandardPaths(object):
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,
 
     The directories returned by the methods of this class may or may not
     exist. If they don't exist, it's up to the caller to create them,

-    wxStandardPaths doesn't do it.
+    wx.StandardPaths doesn't do it.

 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard
 
     Finally note that these functions only work with standardly packaged
     applications. I.e. under Unix you should follow the standard


@@ -5653,6 +5682,9 @@ class StandardPaths(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    ResourceCat_None = _misc_.StandardPaths_ResourceCat_None
+    ResourceCat_Messages = _misc_.StandardPaths_ResourceCat_Messages
+    ResourceCat_Max = _misc_.StandardPaths_ResourceCat_Max

     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths
     def Get(*args, **kwargs):
         """
         Get() -> StandardPaths


@@ -5739,6 +5771,32 @@ class StandardPaths(object):
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 
         """
         return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
 

+    def GetResourcesDir(*args, **kwargs):
+        """
+        GetResourcesDir(self) -> String
+
+        Get resources directory.  Resources are auxiliary files used by the
+        application and include things like image and sound files.
+
+        Same as `GetDataDir` for all platforms except Mac where it returns
+        Contents/Resources subdirectory of the app bundle.
+        """
+        return _misc_.StandardPaths_GetResourcesDir(*args, **kwargs)
+
+    def GetLocalizedResourcesDir(*args, **kwargs):
+        """
+        GetLocalizedResourcesDir(self, String lang, int category=ResourceCat_None) -> String
+
+        Get localized resources directory containing the resource files of the
+        specified category for the given language.
+
+        In general this is just GetResourcesDir()/lang under Windows and Unix
+        and GetResourcesDir()/lang.lproj under Mac but is something quite
+        different under Unix for the message catalog category (namely the
+        standard prefix/share/locale/lang/LC_MESSAGES.)
+        """
+        return _misc_.StandardPaths_GetLocalizedResourcesDir(*args, **kwargs)
+

     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)
     def SetInstallPrefix(*args, **kwargs):
         """
         SetInstallPrefix(self, String prefix)

diff --git a/wxPython/src/msw/_misc_wrap.cpp b/wxPython/src/msw/_misc_wrap.cpp
index b74f73b1eec44ba45682348c11d01a113efa2dba..5e2ec310348004d429bc55d72caac77ec8d874c3 100644 (file)
--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
@@ -3531,12 +3531,14 @@ SWIGINTERN void wxPyArtProvider_Destroy(wxPyArtProvider *self){ delete self; }
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {
 
 
     static PyObject* __EnumerationHelper(bool flag, wxString& str, long index) {

+        wxPyBlock_t blocked = wxPyBeginBlockThreads();

         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }
         PyObject* ret = PyTuple_New(3);
         if (ret) {
             PyTuple_SET_ITEM(ret, 0, PyInt_FromLong(flag));
            PyTuple_SET_ITEM(ret, 1, wx2PyString(str));
             PyTuple_SET_ITEM(ret, 2, PyInt_FromLong(index));
         }

+        wxPyEndBlockThreads(blocked);

         return ret;
     }
 
         return ret;
     }
 


@@ -27290,6 +27292,54 @@ SWIGINTERN PyObject *DateTime_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_TimeSpan_Milliseconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  long arg1 ;
+  wxTimeSpan result;
+  long val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "ms", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:TimeSpan_Milliseconds",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_long(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "TimeSpan_Milliseconds" "', expected argument " "1"" of type '" "long""'");
+  } 
+  arg1 = static_cast< long >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Milliseconds(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_TimeSpan_Millisecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxTimeSpan result;
+  
+  if (!SWIG_Python_UnpackTuple(args,"TimeSpan_Millisecond",0,0,0)) SWIG_fail;
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxTimeSpan::Millisecond();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxTimeSpan(static_cast< const wxTimeSpan& >(result))), SWIGTYPE_p_wxTimeSpan, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;
 SWIGINTERN PyObject *_wrap_TimeSpan_Seconds(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   long arg1 ;


@@ -31304,6 +31354,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_DataObjectComposite_GetReceivedFormat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxDataObjectComposite *arg1 = (wxDataObjectComposite *) 0 ;
+  SwigValueWrapper<wxDataFormat > result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxDataObjectComposite, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DataObjectComposite_GetReceivedFormat" "', expected argument " "1"" of type '" "wxDataObjectComposite const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxDataObjectComposite * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxDataObjectComposite const *)arg1)->GetReceivedFormat();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxDataFormat(static_cast< const wxDataFormat& >(result))), SWIGTYPE_p_wxDataFormat, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *DataObjectComposite_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -35691,6 +35769,103 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_StandardPaths_GetResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetResourcesDir();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_StandardPaths_GetLocalizedResourcesDir(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
+  wxString *arg2 = 0 ;
+  wxStandardPaths::ResourceCat arg3 = (wxStandardPaths::ResourceCat) wxStandardPaths::ResourceCat_None ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  int val3 ;
+  int ecode3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "lang",(char *) "category", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:StandardPaths_GetLocalizedResourcesDir",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxStandardPaths, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "1"" of type '" "wxStandardPaths const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxStandardPaths * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  if (obj2) {
+    ecode3 = SWIG_AsVal_int(obj2, &val3);
+    if (!SWIG_IsOK(ecode3)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "StandardPaths_GetLocalizedResourcesDir" "', expected argument " "3"" of type '" "wxStandardPaths::ResourceCat""'");
+    } 
+    arg3 = static_cast< wxStandardPaths::ResourceCat >(val3);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxStandardPaths const *)arg1)->GetLocalizedResourcesDir((wxString const &)*arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;
 SWIGINTERN PyObject *_wrap_StandardPaths_SetInstallPrefix(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxStandardPaths *arg1 = (wxStandardPaths *) 0 ;


@@ -36414,6 +36589,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},
         { (char *)"DateTime_FormatISOTime", (PyCFunction)_wrap_DateTime_FormatISOTime, METH_O, NULL},
         { (char *)"DateTime_swigregister", DateTime_swigregister, METH_VARARGS, NULL},
         { (char *)"DateTime_swiginit", DateTime_swiginit, METH_VARARGS, NULL},

+        { (char *)"TimeSpan_Milliseconds", (PyCFunction) _wrap_TimeSpan_Milliseconds, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"TimeSpan_Millisecond", (PyCFunction)_wrap_TimeSpan_Millisecond, METH_NOARGS, NULL},

         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Seconds", (PyCFunction) _wrap_TimeSpan_Seconds, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"TimeSpan_Second", (PyCFunction)_wrap_TimeSpan_Second, METH_NOARGS, NULL},
         { (char *)"TimeSpan_Minutes", (PyCFunction) _wrap_TimeSpan_Minutes, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36533,6 +36710,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyDataObjectSimple_swiginit", PyDataObjectSimple_swiginit, METH_VARARGS, NULL},
         { (char *)"new_DataObjectComposite", (PyCFunction)_wrap_new_DataObjectComposite, METH_NOARGS, NULL},
         { (char *)"DataObjectComposite_Add", (PyCFunction) _wrap_DataObjectComposite_Add, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"DataObjectComposite_GetReceivedFormat", (PyCFunction)_wrap_DataObjectComposite_GetReceivedFormat, METH_O, NULL},

         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"DataObjectComposite_swigregister", DataObjectComposite_swigregister, METH_VARARGS, NULL},
         { (char *)"DataObjectComposite_swiginit", DataObjectComposite_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TextDataObject", (PyCFunction) _wrap_new_TextDataObject, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -36683,6 +36861,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserDataDir", (PyCFunction)_wrap_StandardPaths_GetUserDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetUserLocalDataDir", (PyCFunction)_wrap_StandardPaths_GetUserLocalDataDir, METH_O, NULL},
         { (char *)"StandardPaths_GetPluginsDir", (PyCFunction)_wrap_StandardPaths_GetPluginsDir, METH_O, NULL},

+        { (char *)"StandardPaths_GetResourcesDir", (PyCFunction)_wrap_StandardPaths_GetResourcesDir, METH_O, NULL},
+        { (char *)"StandardPaths_GetLocalizedResourcesDir", (PyCFunction) _wrap_StandardPaths_GetLocalizedResourcesDir, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},
         { (char *)"StandardPaths_SetInstallPrefix", (PyCFunction) _wrap_StandardPaths_SetInstallPrefix, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"StandardPaths_GetInstallPrefix", (PyCFunction)_wrap_StandardPaths_GetInstallPrefix, METH_O, NULL},
         { (char *)"StandardPaths_swigregister", StandardPaths_swigregister, METH_VARARGS, NULL},


@@ -38841,5 +39021,8 @@ SWIGEXPORT void SWIG_init(void) {
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);
   wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget");
   
   SWIG_addvarlink(SWIG_globals(),(char*)"DefaultVideoMode",DefaultVideoMode_get, DefaultVideoMode_set);

+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_None",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_None)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Messages",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Messages)));
+  SWIG_Python_SetConstant(d, "StandardPaths_ResourceCat_Max",SWIG_From_int(static_cast< int >(wxStandardPaths::ResourceCat_Max)));

 }
 
 }
 

diff --git a/wxPython/src/msw/_windows.py b/wxPython/src/msw/_windows.py
index 589a57e466395dac48fbcd0c5e2f509d76520c7f..a6edc1450282992dde093320074708badc389419 100644 (file)
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -1965,6 +1965,10 @@ class HtmlListBox(VListBox):
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 
         """GetFileSystem(self) -> FileSystem"""
         return _windows_.HtmlListBox_GetFileSystem(*args, **kwargs)
 

+    def OnLinkClicked(*args, **kwargs):
+        """OnLinkClicked(self, size_t n, wxHtmlLinkInfo link)"""
+        return _windows_.HtmlListBox_OnLinkClicked(*args, **kwargs)
+

 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 
 HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
 HtmlListBox_swigregister(HtmlListBox)
 

diff --git a/wxPython/src/msw/_windows_wrap.cpp b/wxPython/src/msw/_windows_wrap.cpp
index 0f0a4f4572930397d7259435617bff6b7b748833..f11bcce02e4470dfe5eb57d3309307bac39e2952 100644 (file)
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -2509,118 +2509,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]
 #define SWIGTYPE_p_wxGIFHandler swig_types[47]
 #define SWIGTYPE_p_wxGridBagSizer swig_types[48]
 #define SWIGTYPE_p_wxGridSizer swig_types[49]

-#define SWIGTYPE_p_wxICOHandler swig_types[50]
-#define SWIGTYPE_p_wxIcon swig_types[51]
-#define SWIGTYPE_p_wxIconBundle swig_types[52]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[53]
-#define SWIGTYPE_p_wxIdleEvent swig_types[54]
-#define SWIGTYPE_p_wxImage swig_types[55]
-#define SWIGTYPE_p_wxImageHandler swig_types[56]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[57]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[58]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[59]
-#define SWIGTYPE_p_wxKeyEvent swig_types[60]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[61]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[62]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[63]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[64]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[65]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[66]
-#define SWIGTYPE_p_wxMenu swig_types[67]
-#define SWIGTYPE_p_wxMenuBar swig_types[68]
-#define SWIGTYPE_p_wxMenuEvent swig_types[69]
-#define SWIGTYPE_p_wxMenuItem swig_types[70]
-#define SWIGTYPE_p_wxMessageDialog swig_types[71]
-#define SWIGTYPE_p_wxMiniFrame swig_types[72]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[73]
-#define SWIGTYPE_p_wxMouseEvent swig_types[74]
-#define SWIGTYPE_p_wxMoveEvent swig_types[75]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[76]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[77]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[78]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[79]
-#define SWIGTYPE_p_wxObject swig_types[80]
-#define SWIGTYPE_p_wxPCXHandler swig_types[81]
-#define SWIGTYPE_p_wxPNGHandler swig_types[82]
-#define SWIGTYPE_p_wxPNMHandler swig_types[83]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[84]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[85]
-#define SWIGTYPE_p_wxPaintEvent swig_types[86]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[87]
-#define SWIGTYPE_p_wxPanel swig_types[88]
-#define SWIGTYPE_p_wxPaperSize swig_types[89]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[90]
-#define SWIGTYPE_p_wxPoint swig_types[91]
-#define SWIGTYPE_p_wxPopupWindow swig_types[92]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[93]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[94]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[95]
-#define SWIGTYPE_p_wxPrintData swig_types[96]
-#define SWIGTYPE_p_wxPrintDialog swig_types[97]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[98]
-#define SWIGTYPE_p_wxPrintPreview swig_types[99]
-#define SWIGTYPE_p_wxPrinter swig_types[100]
-#define SWIGTYPE_p_wxProgressDialog swig_types[101]
-#define SWIGTYPE_p_wxPyApp swig_types[102]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[103]
-#define SWIGTYPE_p_wxPyEvent swig_types[104]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[105]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[106]
-#define SWIGTYPE_p_wxPyPanel swig_types[107]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[108]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[109]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[110]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[111]
-#define SWIGTYPE_p_wxPyPrintout swig_types[112]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[113]
-#define SWIGTYPE_p_wxPySizer swig_types[114]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[115]
-#define SWIGTYPE_p_wxPyVListBox swig_types[116]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[117]
-#define SWIGTYPE_p_wxPyValidator swig_types[118]
-#define SWIGTYPE_p_wxPyWindow swig_types[119]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[120]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[121]
-#define SWIGTYPE_p_wxRect swig_types[122]
-#define SWIGTYPE_p_wxRegion swig_types[123]
-#define SWIGTYPE_p_wxSashEvent swig_types[124]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[125]
-#define SWIGTYPE_p_wxSashWindow swig_types[126]
-#define SWIGTYPE_p_wxScrollEvent swig_types[127]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[128]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[129]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[130]
-#define SWIGTYPE_p_wxShowEvent swig_types[131]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[132]
-#define SWIGTYPE_p_wxSize swig_types[133]
-#define SWIGTYPE_p_wxSizeEvent swig_types[134]
-#define SWIGTYPE_p_wxSizer swig_types[135]
-#define SWIGTYPE_p_wxSizerItem swig_types[136]
-#define SWIGTYPE_p_wxSplashScreen swig_types[137]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[138]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[139]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[140]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[141]
-#define SWIGTYPE_p_wxStatusBar swig_types[142]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[143]
-#define SWIGTYPE_p_wxString swig_types[144]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[145]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[146]
-#define SWIGTYPE_p_wxTaskBarIcon swig_types[147]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[148]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[149]
-#define SWIGTYPE_p_wxTipWindow swig_types[150]
-#define SWIGTYPE_p_wxToolBar swig_types[151]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[152]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[153]
-#define SWIGTYPE_p_wxValidator swig_types[154]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[155]
-#define SWIGTYPE_p_wxWindow swig_types[156]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[157]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[158]
-#define SWIGTYPE_p_wxXPMHandler swig_types[159]
-static swig_type_info *swig_types[161];
-static swig_module_info swig_module = {swig_types, 160, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[50]
+#define SWIGTYPE_p_wxICOHandler swig_types[51]
+#define SWIGTYPE_p_wxIcon swig_types[52]
+#define SWIGTYPE_p_wxIconBundle swig_types[53]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[54]
+#define SWIGTYPE_p_wxIdleEvent swig_types[55]
+#define SWIGTYPE_p_wxImage swig_types[56]
+#define SWIGTYPE_p_wxImageHandler swig_types[57]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[58]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[59]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[60]
+#define SWIGTYPE_p_wxKeyEvent swig_types[61]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[62]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[63]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[64]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[65]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[66]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[67]
+#define SWIGTYPE_p_wxMenu swig_types[68]
+#define SWIGTYPE_p_wxMenuBar swig_types[69]
+#define SWIGTYPE_p_wxMenuEvent swig_types[70]
+#define SWIGTYPE_p_wxMenuItem swig_types[71]
+#define SWIGTYPE_p_wxMessageDialog swig_types[72]
+#define SWIGTYPE_p_wxMiniFrame swig_types[73]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[74]
+#define SWIGTYPE_p_wxMouseEvent swig_types[75]
+#define SWIGTYPE_p_wxMoveEvent swig_types[76]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[77]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[78]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[79]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[80]
+#define SWIGTYPE_p_wxObject swig_types[81]
+#define SWIGTYPE_p_wxPCXHandler swig_types[82]
+#define SWIGTYPE_p_wxPNGHandler swig_types[83]
+#define SWIGTYPE_p_wxPNMHandler swig_types[84]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[85]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[86]
+#define SWIGTYPE_p_wxPaintEvent swig_types[87]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[88]
+#define SWIGTYPE_p_wxPanel swig_types[89]
+#define SWIGTYPE_p_wxPaperSize swig_types[90]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[91]
+#define SWIGTYPE_p_wxPoint swig_types[92]
+#define SWIGTYPE_p_wxPopupWindow swig_types[93]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[94]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[95]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[96]
+#define SWIGTYPE_p_wxPrintData swig_types[97]
+#define SWIGTYPE_p_wxPrintDialog swig_types[98]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[99]
+#define SWIGTYPE_p_wxPrintPreview swig_types[100]
+#define SWIGTYPE_p_wxPrinter swig_types[101]
+#define SWIGTYPE_p_wxProgressDialog swig_types[102]
+#define SWIGTYPE_p_wxPyApp swig_types[103]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[104]
+#define SWIGTYPE_p_wxPyEvent swig_types[105]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[106]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[107]
+#define SWIGTYPE_p_wxPyPanel swig_types[108]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[109]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[110]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[111]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[112]
+#define SWIGTYPE_p_wxPyPrintout swig_types[113]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[114]
+#define SWIGTYPE_p_wxPySizer swig_types[115]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[116]
+#define SWIGTYPE_p_wxPyVListBox swig_types[117]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[118]
+#define SWIGTYPE_p_wxPyValidator swig_types[119]
+#define SWIGTYPE_p_wxPyWindow swig_types[120]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[121]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[122]
+#define SWIGTYPE_p_wxRect swig_types[123]
+#define SWIGTYPE_p_wxRegion swig_types[124]
+#define SWIGTYPE_p_wxSashEvent swig_types[125]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[126]
+#define SWIGTYPE_p_wxSashWindow swig_types[127]
+#define SWIGTYPE_p_wxScrollEvent swig_types[128]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[129]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[130]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[131]
+#define SWIGTYPE_p_wxShowEvent swig_types[132]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[133]
+#define SWIGTYPE_p_wxSize swig_types[134]
+#define SWIGTYPE_p_wxSizeEvent swig_types[135]
+#define SWIGTYPE_p_wxSizer swig_types[136]
+#define SWIGTYPE_p_wxSizerItem swig_types[137]
+#define SWIGTYPE_p_wxSplashScreen swig_types[138]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[139]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[140]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[141]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[142]
+#define SWIGTYPE_p_wxStatusBar swig_types[143]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[144]
+#define SWIGTYPE_p_wxString swig_types[145]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[146]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[147]
+#define SWIGTYPE_p_wxTaskBarIcon swig_types[148]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[149]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[150]
+#define SWIGTYPE_p_wxTipWindow swig_types[151]
+#define SWIGTYPE_p_wxToolBar swig_types[152]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[153]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[154]
+#define SWIGTYPE_p_wxValidator swig_types[155]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[156]
+#define SWIGTYPE_p_wxWindow swig_types[157]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[158]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[159]
+#define SWIGTYPE_p_wxXPMHandler swig_types[160]
+static swig_type_info *swig_types[162];
+static swig_module_info swig_module = {swig_types, 161, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3098,6 +3099,11 @@ public:
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 
 //     // globally using SetSelectionBackground()
 //     virtual wxColour GetSelectedTextBgColour(const wxColour& colBg) const;
 

+    
+    // This method may be overriden to handle clicking on a link in
+    // the listbox. By default, clicking links is ignored.
+    virtual void OnLinkClicked(size_t n,
+                               const wxHtmlLinkInfo& link);        

 
     PYPRIVATE;
 };
 
     PYPRIVATE;
 };


@@ -3111,6 +3117,21 @@ IMP_PYCALLBACK__DCRECTSIZET2_const   (wxPyHtmlListBox, wxHtmlListBox, OnDrawSepa
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 
 IMP_PYCALLBACK__DCRECTSIZET_const    (wxPyHtmlListBox, wxHtmlListBox, OnDrawBackground);
 
 

+void wxPyHtmlListBox::OnLinkClicked(size_t n,
+                                    const wxHtmlLinkInfo& link) {
+    bool found;
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
+    if ((found = wxPyCBH_findCallback(m_myInst, "OnLinkClicked"))) {
+        PyObject* obj = wxPyConstructObject((void*)&link, wxT("wxHtmlLinkInfo"), 0);
+        wxPyCBH_callCallback(m_myInst, Py_BuildValue("(iO)", n, obj));
+        Py_DECREF(obj);
+    }
+    wxPyEndBlockThreads(blocked);
+    if (! found)
+        wxPyHtmlListBox::OnLinkClicked(n, link);
+}
+ 
+

 
 
 
 
 
 


@@ -15656,6 +15677,56 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlListBox_OnLinkClicked(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlListBox *arg1 = (wxPyHtmlListBox *) 0 ;
+  size_t arg2 ;
+  wxHtmlLinkInfo *arg3 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "n",(char *) "link", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlListBox_OnLinkClicked",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlListBox, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "1"" of type '" "wxPyHtmlListBox *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlListBox * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_wxHtmlLinkInfo,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlListBox_OnLinkClicked" "', expected argument " "3"" of type '" "wxHtmlLinkInfo const &""'"); 
+  }
+  arg3 = reinterpret_cast< wxHtmlLinkInfo * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->OnLinkClicked(arg2,(wxHtmlLinkInfo const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlListBox_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -30897,6 +30968,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},
         { (char *)"HtmlListBox_Create", (PyCFunction) _wrap_HtmlListBox_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_SetItemCount", (PyCFunction) _wrap_HtmlListBox_SetItemCount, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlListBox_GetFileSystem", (PyCFunction)_wrap_HtmlListBox_GetFileSystem, METH_O, NULL},

+        { (char *)"HtmlListBox_OnLinkClicked", (PyCFunction) _wrap_HtmlListBox_OnLinkClicked, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},
         { (char *)"HtmlListBox_swigregister", HtmlListBox_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlListBox_swiginit", HtmlListBox_swiginit, METH_VARARGS, NULL},
         { (char *)"new_TaskBarIcon", (PyCFunction)_wrap_new_TaskBarIcon, METH_NOARGS, NULL},


@@ -32422,6 +32494,7 @@ static swig_type_info _swigt__p_wxFont = {"_p_wxFont", "wxFont *", 0, 0, (void*)
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontData = {"_p_wxFontData", "wxFontData *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFontDialog = {"_p_wxFontDialog", "wxFontDialog *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxFrame = {"_p_wxFrame", "wxFrame *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlLinkInfo = {"_p_wxHtmlLinkInfo", "wxHtmlLinkInfo *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIcon = {"_p_wxIcon", "wxIcon *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxIconBundle = {"_p_wxIconBundle", "wxIconBundle *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutAlgorithm = {"_p_wxLayoutAlgorithm", "wxLayoutAlgorithm *", 0, 0, (void*)0, 0};


@@ -32568,6 +32641,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,
   &_swigt__p_wxGIFHandler,
   &_swigt__p_wxGridBagSizer,
   &_swigt__p_wxGridSizer,

+  &_swigt__p_wxHtmlLinkInfo,

   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIcon,
   &_swigt__p_wxIconBundle,


@@ -32746,6 +32820,7 @@ static swig_cast_info _swigc__p_wxFont[] = {  {&_swigt__p_wxFont, 0, 0, 0},{0, 0
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontData[] = {  {&_swigt__p_wxFontData, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFontDialog[] = {  {&_swigt__p_wxFontDialog, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxFrame[] = {  {&_swigt__p_wxMDIChildFrame, _p_wxMDIChildFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxProgressDialog, _p_wxProgressDialogTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPreviewFrame, _p_wxPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxPyPreviewFrame, _p_wxPyPreviewFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMiniFrame, _p_wxMiniFrameTo_p_wxFrame, 0, 0},  {&_swigt__p_wxFrame, 0, 0, 0},  {&_swigt__p_wxSplashScreen, _p_wxSplashScreenTo_p_wxFrame, 0, 0},  {&_swigt__p_wxMDIParentFrame, _p_wxMDIParentFrameTo_p_wxFrame, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlLinkInfo[] = {  {&_swigt__p_wxHtmlLinkInfo, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIcon[] = {  {&_swigt__p_wxIcon, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxIconBundle[] = {  {&_swigt__p_wxIconBundle, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutAlgorithm[] = {  {&_swigt__p_wxLayoutAlgorithm, 0, 0, 0},{0, 0, 0, 0}};


@@ -32892,6 +32967,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,
   _swigc__p_wxGIFHandler,
   _swigc__p_wxGridBagSizer,
   _swigc__p_wxGridSizer,

+  _swigc__p_wxHtmlLinkInfo,

   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIcon,
   _swigc__p_wxIconBundle,

diff --git a/wxPython/src/msw/grid.py b/wxPython/src/msw/grid.py
index 73fd329aaa65d47cdb6d6d5b47ff6a2f39124d7f..4cb321f50a32b5373c2a1eeaada232c728996ad8 100644 (file)
--- a/wxPython/src/msw/grid.py
+++ b/wxPython/src/msw/grid.py
@@ -736,6 +736,8 @@ class GridTableBase(_core.Object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     def __init__(self): raise AttributeError, "No constructor defined"
     __repr__ = _swig_repr

+    __swig_destroy__ = _grid.delete_GridTableBase
+    __del__ = lambda self : None;

     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)
     def _setOORInfo(*args, **kwargs):
         """_setOORInfo(self, PyObject _self)"""
         return _grid.GridTableBase__setOORInfo(*args, **kwargs)


@@ -1094,11 +1096,19 @@ class GridCellCoords(object):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):
         return _grid.GridCellCoords_Set(*args, **kwargs)
 
     def __eq__(*args, **kwargs):

-        """__eq__(self, GridCellCoords other) -> bool"""
+        """
+        __eq__(self, PyObject other) -> bool
+
+        Test for equality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):
         return _grid.GridCellCoords___eq__(*args, **kwargs)
 
     def __ne__(*args, **kwargs):

-        """__ne__(self, GridCellCoords other) -> bool"""
+        """
+        __ne__(self, PyObject other) -> bool
+
+        Test for inequality of GridCellCoords objects.
+        """

         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):
         return _grid.GridCellCoords___ne__(*args, **kwargs)
 
     def Get(*args, **kwargs):


@@ -2027,6 +2037,10 @@ class GridEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridEvent_CmdDown(*args, **kwargs)
+

 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 
 GridEvent_swigregister = _grid.GridEvent_swigregister
 GridEvent_swigregister(GridEvent)
 


@@ -2065,6 +2079,10 @@ class GridSizeEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridSizeEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridSizeEvent_CmdDown(*args, **kwargs)
+

 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 
 GridSizeEvent_swigregister = _grid.GridSizeEvent_swigregister
 GridSizeEvent_swigregister(GridSizeEvent)
 


@@ -2124,6 +2142,10 @@ class GridRangeSelectEvent(_core.NotifyEvent):
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 
         """AltDown(self) -> bool"""
         return _grid.GridRangeSelectEvent_AltDown(*args, **kwargs)
 

+    def CmdDown(*args, **kwargs):
+        """CmdDown(self) -> bool"""
+        return _grid.GridRangeSelectEvent_CmdDown(*args, **kwargs)
+

 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 
 GridRangeSelectEvent_swigregister = _grid.GridRangeSelectEvent_swigregister
 GridRangeSelectEvent_swigregister(GridRangeSelectEvent)
 

diff --git a/wxPython/src/msw/grid_wrap.cpp b/wxPython/src/msw/grid_wrap.cpp
index 5b1d069fe24624b57b5e6970614a30f412a433fd..85afa780b32d89f06422e4a9ca3984b5cae9a357 100644 (file)
--- a/wxPython/src/msw/grid_wrap.cpp
+++ b/wxPython/src/msw/grid_wrap.cpp
@@ -3737,6 +3737,24 @@ PyObject* wxGridCellCoordsArray_helper(const wxGridCellCoordsArray& source)
     return list;
 }
 
     return list;
 }
 

+SWIGINTERN bool wxGridCellCoords___eq__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return false;
+            if ( ! wxGridCellCoords_helper(other, &obj) ) {
+                PyErr_Clear();
+                return false;
+            }
+            return self->operator==(*obj);
+        }
+SWIGINTERN bool wxGridCellCoords___ne__(wxGridCellCoords *self,PyObject *other){
+            wxGridCellCoords  temp, *obj = &temp;
+            if ( other == Py_None ) return true;
+            if ( ! wxGridCellCoords_helper(other, &obj)) {
+                PyErr_Clear();
+                return true;
+            }
+            return self->operator!=(*obj);
+        }

 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));
 SWIGINTERN PyObject *wxGridCellCoords_Get(wxGridCellCoords *self){
             PyObject* tup = PyTuple_New(2);
             PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->GetRow()));


@@ -7625,6 +7643,34 @@ SWIGINTERN PyObject *PyGridCellAttrProvider_swiginit(PyObject *SWIGUNUSEDPARM(se
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_GridTableBase(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_GridTableBase" "', expected argument " "1"" of type '" "wxGridTableBase *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridTableBase * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;
 SWIGINTERN PyObject *_wrap_GridTableBase__setOORInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridTableBase *arg1 = (wxGridTableBase *) 0 ;


@@ -10053,11 +10099,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10067,17 +10112,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___eq__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___eq__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___eq__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator ==((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___eq__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10092,11 +10132,10 @@ fail:
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;
 SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxGridCellCoords *arg1 = (wxGridCellCoords *) 0 ;

-  wxGridCellCoords *arg2 = 0 ;
+  PyObject *arg2 = (PyObject *) 0 ;

   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  wxGridCellCoords temp2 ;

   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {
   PyObject * obj0 = 0 ;
   PyObject * obj1 = 0 ;
   char *  kwnames[] = {


@@ -10106,17 +10145,12 @@ SWIGINTERN PyObject *_wrap_GridCellCoords___ne__(PyObject *SWIGUNUSEDPARM(self),
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GridCellCoords___ne__",kwnames,&obj0,&obj1)) SWIG_fail;
   res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGridCellCoords, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridCellCoords___ne__" "', expected argument " "1"" of type '" "wxGridCellCoords *""'"); 

   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);
   }
   arg1 = reinterpret_cast< wxGridCellCoords * >(argp1);

+  arg2 = obj1;

   {
   {

-    arg2 = &temp2;
-    if (! wxGridCellCoords_helper(obj1, &arg2)) SWIG_fail;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)((wxGridCellCoords const *)arg1)->operator !=((wxGridCellCoords const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
+    result = (bool)wxGridCellCoords___ne__(arg1,arg2);

     if (PyErr_Occurred()) SWIG_fail;
   }
   {
     if (PyErr_Occurred()) SWIG_fail;
   }
   {


@@ -10646,7 +10680,6 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
   void *argp1 = 0 ;
   int res1 = 0 ;

-  void *argp2 = 0 ;

   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;
   int res2 = 0 ;
   bool val3 ;
   int ecode3 = 0 ;


@@ -10666,11 +10699,10 @@ SWIGINTERN PyObject *_wrap_Grid_SetTable(PyObject *SWIGUNUSEDPARM(self), PyObjec
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Grid_SetTable" "', expected argument " "1"" of type '" "wxGrid *""'"); 
   }
   arg1 = reinterpret_cast< wxGrid * >(argp1);

-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxGridTableBase, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, SWIG_as_voidptrptr(&arg2), SWIGTYPE_p_wxGridTableBase, SWIG_POINTER_DISOWN |  0 );

   if (!SWIG_IsOK(res2)) {
   if (!SWIG_IsOK(res2)) {

-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Grid_SetTable" "', expected argument " "2"" of type '" "wxGridTableBase *""'");

   }
   }

-  arg2 = reinterpret_cast< wxGridTableBase * >(argp2);

   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {
   if (obj2) {
     ecode3 = SWIG_AsVal_bool(obj2, &val3);
     if (!SWIG_IsOK(ecode3)) {


@@ -18842,6 +18874,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridEvent *arg1 = (wxGridEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19154,6 +19216,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridSizeEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridSizeEvent *arg1 = (wxGridSizeEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridSizeEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridSizeEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridSizeEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridSizeEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridSizeEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -19600,6 +19692,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_GridRangeSelectEvent_CmdDown(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxGridRangeSelectEvent *arg1 = (wxGridRangeSelectEvent *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGridRangeSelectEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GridRangeSelectEvent_CmdDown" "', expected argument " "1"" of type '" "wxGridRangeSelectEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxGridRangeSelectEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->CmdDown();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *GridRangeSelectEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -20039,6 +20161,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_SetColAttr", (PyCFunction) _wrap_PyGridCellAttrProvider_SetColAttr, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"PyGridCellAttrProvider_swigregister", PyGridCellAttrProvider_swigregister, METH_VARARGS, NULL},
         { (char *)"PyGridCellAttrProvider_swiginit", PyGridCellAttrProvider_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_GridTableBase", (PyCFunction)_wrap_delete_GridTableBase, METH_O, NULL},

         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},
         { (char *)"GridTableBase__setOORInfo", (PyCFunction) _wrap_GridTableBase__setOORInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_SetAttrProvider", (PyCFunction) _wrap_GridTableBase_SetAttrProvider, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridTableBase_GetAttrProvider", (PyCFunction)_wrap_GridTableBase_GetAttrProvider, METH_O, NULL},


@@ -20319,6 +20442,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},
         { (char *)"GridEvent_MetaDown", (PyCFunction)_wrap_GridEvent_MetaDown, METH_O, NULL},
         { (char *)"GridEvent_ShiftDown", (PyCFunction)_wrap_GridEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridEvent_AltDown", (PyCFunction)_wrap_GridEvent_AltDown, METH_O, NULL},

+        { (char *)"GridEvent_CmdDown", (PyCFunction)_wrap_GridEvent_CmdDown, METH_O, NULL},

         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridEvent_swigregister", GridEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridEvent_swiginit", GridEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridSizeEvent", (PyCFunction) _wrap_new_GridSizeEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20328,6 +20452,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},
         { (char *)"GridSizeEvent_MetaDown", (PyCFunction)_wrap_GridSizeEvent_MetaDown, METH_O, NULL},
         { (char *)"GridSizeEvent_ShiftDown", (PyCFunction)_wrap_GridSizeEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridSizeEvent_AltDown", (PyCFunction)_wrap_GridSizeEvent_AltDown, METH_O, NULL},

+        { (char *)"GridSizeEvent_CmdDown", (PyCFunction)_wrap_GridSizeEvent_CmdDown, METH_O, NULL},

         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridSizeEvent_swigregister", GridSizeEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridSizeEvent_swiginit", GridSizeEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridRangeSelectEvent", (PyCFunction) _wrap_new_GridRangeSelectEvent, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -20342,6 +20467,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_MetaDown", (PyCFunction)_wrap_GridRangeSelectEvent_MetaDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_ShiftDown", (PyCFunction)_wrap_GridRangeSelectEvent_ShiftDown, METH_O, NULL},
         { (char *)"GridRangeSelectEvent_AltDown", (PyCFunction)_wrap_GridRangeSelectEvent_AltDown, METH_O, NULL},

+        { (char *)"GridRangeSelectEvent_CmdDown", (PyCFunction)_wrap_GridRangeSelectEvent_CmdDown, METH_O, NULL},

         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"GridRangeSelectEvent_swigregister", GridRangeSelectEvent_swigregister, METH_VARARGS, NULL},
         { (char *)"GridRangeSelectEvent_swiginit", GridRangeSelectEvent_swiginit, METH_VARARGS, NULL},
         { (char *)"new_GridEditorCreatedEvent", (PyCFunction) _wrap_new_GridEditorCreatedEvent, METH_VARARGS | METH_KEYWORDS, NULL},

diff --git a/wxPython/src/msw/html.py b/wxPython/src/msw/html.py
index ac71f5126c443b7d0aee754332761282d37c4972..f2c18521a362ebb12409a6736063a4e21f6c04b6 100644 (file)
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -224,6 +224,10 @@ class HtmlParser(_core.Object):
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 
         """PopTagHandler(self)"""
         return _html.HtmlParser_PopTagHandler(*args, **kwargs)
 

+    def GetInnerSource(*args, **kwargs):
+        """GetInnerSource(self, HtmlTag tag) -> String"""
+        return _html.HtmlParser_GetInnerSource(*args, **kwargs)
+

 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 
 HtmlParser_swigregister = _html.HtmlParser_swigregister
 HtmlParser_swigregister(HtmlParser)
 


@@ -254,6 +258,11 @@ class HtmlWinParser(HtmlParser):
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 
         """GetWindow(self) -> HtmlWindow"""
         return _html.HtmlWinParser_GetWindow(*args, **kwargs)
 

+    GetWindow = wx._deprecated(GetWindow) 
+    def GetWindowInterface(*args, **kwargs):
+        """GetWindowInterface(self) -> HtmlWindowInterface"""
+        return _html.HtmlWinParser_GetWindowInterface(*args, **kwargs)
+

     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)
     def SetFonts(*args, **kwargs):
         """SetFonts(self, String normal_face, String fixed_face, PyObject sizes=None)"""
         return _html.HtmlWinParser_SetFonts(*args, **kwargs)


@@ -639,10 +648,15 @@ class HtmlCell(_core.Object):
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 
         """GetFirstChild(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstChild(*args, **kwargs)
 

+    def GetMouseCursor(*args, **kwargs):
+        """GetMouseCursor(self, HtmlWindowInterface window) -> Cursor"""
+        return _html.HtmlCell_GetMouseCursor(*args, **kwargs)
+

     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 
     def GetCursor(*args, **kwargs):
         """GetCursor(self) -> Cursor"""
         return _html.HtmlCell_GetCursor(*args, **kwargs)
 

+    GetCursor = wx._deprecated(GetCursor) 

     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)
     def IsFormattingCell(*args, **kwargs):
         """IsFormattingCell(self) -> bool"""
         return _html.HtmlCell_IsFormattingCell(*args, **kwargs)


@@ -679,6 +693,10 @@ class HtmlCell(_core.Object):
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 
         """Find(self, int condition, void param) -> HtmlCell"""
         return _html.HtmlCell_Find(*args, **kwargs)
 

+    def ProcessMouseClick(*args, **kwargs):
+        """ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
+        return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)
+

     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
     def AdjustPagebreak(*args, **kwargs):
         """AdjustPagebreak(self, int INOUT) -> bool"""
         return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)


@@ -700,9 +718,13 @@ class HtmlCell(_core.Object):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):
         return _html.HtmlCell_FindCellByPos(*args, **kwargs)
 
     def GetAbsPos(*args, **kwargs):

-        """GetAbsPos(self) -> Point"""
+        """GetAbsPos(self, HtmlCell rootCell=None) -> Point"""

         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 
         return _html.HtmlCell_GetAbsPos(*args, **kwargs)
 

+    def GetRootCell(*args, **kwargs):
+        """GetRootCell(self) -> HtmlCell"""
+        return _html.HtmlCell_GetRootCell(*args, **kwargs)
+

     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)
     def GetFirstTerminal(*args, **kwargs):
         """GetFirstTerminal(self) -> HtmlCell"""
         return _html.HtmlCell_GetFirstTerminal(*args, **kwargs)


@@ -870,6 +892,47 @@ class HtmlFilter(_core.Object):
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 
 HtmlFilter_swigregister = _html.HtmlFilter_swigregister
 HtmlFilter_swigregister(HtmlFilter)
 

+class HtmlWindowInterface(object):
+    """Proxy of C++ HtmlWindowInterface class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+    __swig_destroy__ = _html.delete_HtmlWindowInterface
+    __del__ = lambda self : None;
+    def SetHTMLWindowTitle(*args, **kwargs):
+        """SetHTMLWindowTitle(self, String title)"""
+        return _html.HtmlWindowInterface_SetHTMLWindowTitle(*args, **kwargs)
+
+    def HTMLCoordsToWindow(*args, **kwargs):
+        """HTMLCoordsToWindow(self, HtmlCell cell, Point pos) -> Point"""
+        return _html.HtmlWindowInterface_HTMLCoordsToWindow(*args, **kwargs)
+
+    def GetHTMLWindow(*args, **kwargs):
+        """GetHTMLWindow(self) -> Window"""
+        return _html.HtmlWindowInterface_GetHTMLWindow(*args, **kwargs)
+
+    def GetHTMLBackgroundColour(*args, **kwargs):
+        """GetHTMLBackgroundColour(self) -> Colour"""
+        return _html.HtmlWindowInterface_GetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundColour(*args, **kwargs):
+        """SetHTMLBackgroundColour(self, Colour clr)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundColour(*args, **kwargs)
+
+    def SetHTMLBackgroundImage(*args, **kwargs):
+        """SetHTMLBackgroundImage(self, Bitmap bmpBg)"""
+        return _html.HtmlWindowInterface_SetHTMLBackgroundImage(*args, **kwargs)
+
+    def SetHTMLStatusText(*args, **kwargs):
+        """SetHTMLStatusText(self, String text)"""
+        return _html.HtmlWindowInterface_SetHTMLStatusText(*args, **kwargs)
+
+    HTMLCursor_Default = _html.HtmlWindowInterface_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindowInterface_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindowInterface_HTMLCursor_Text
+HtmlWindowInterface_swigregister = _html.HtmlWindowInterface_swigregister
+HtmlWindowInterface_swigregister(HtmlWindowInterface)
+

 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):
 #---------------------------------------------------------------------------
 
 class HtmlWindow(_windows.ScrolledWindow):


@@ -1035,9 +1098,13 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):
         return _html.HtmlWindow_OnCellMouseHover(*args, **kwargs)
 
     def OnCellClicked(*args, **kwargs):

-        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event)"""
+        """OnCellClicked(self, HtmlCell cell, int x, int y, MouseEvent event) -> bool"""

         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 
         return _html.HtmlWindow_OnCellClicked(*args, **kwargs)
 

+    def OnOpeningURL(*args, **kwargs):
+        """OnOpeningURL(self, int type, String url, String redirect) -> int"""
+        return _html.HtmlWindow_OnOpeningURL(*args, **kwargs)
+

     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,
     def base_OnLinkClicked(*args, **kw):
         return HtmlWindow.OnLinkClicked(*args, **kw)
     base_OnLinkClicked = wx._deprecated(base_OnLinkClicked,


@@ -1076,6 +1143,14 @@ class HtmlWindow(_windows.ScrolledWindow):
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
         return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)

+    HTMLCursor_Default = _html.HtmlWindow_HTMLCursor_Default
+    HTMLCursor_Link = _html.HtmlWindow_HTMLCursor_Link
+    HTMLCursor_Text = _html.HtmlWindow_HTMLCursor_Text
+    def GetDefaultHTMLCursor(*args, **kwargs):
+        """GetDefaultHTMLCursor(int type) -> Cursor"""
+        return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+
+    GetDefaultHTMLCursor = staticmethod(GetDefaultHTMLCursor)

 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 
 HtmlWindow_swigregister = _html.HtmlWindow_swigregister
 HtmlWindow_swigregister(HtmlWindow)
 


@@ -1105,6 +1180,10 @@ def HtmlWindow_GetClassDefaultAttributes(*args, **kwargs):
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     """
   return _html.HtmlWindow_GetClassDefaultAttributes(*args, **kwargs)
 

+def HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs):
+  """HtmlWindow_GetDefaultHTMLCursor(int type) -> Cursor"""
+  return _html.HtmlWindow_GetDefaultHTMLCursor(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):
 #---------------------------------------------------------------------------
 
 class HtmlDCRenderer(_core.Object):


@@ -1599,7 +1678,7 @@ class HtmlHelpFrame(_windows.Frame):
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)
 
     def KeywordSearch(self, keyword):
         return self.GetHelpWindow().KeywordSearch(keyword)

-         
+

     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):
     def UseConfig(self, config, rootpath=""):
         return self.GetHelpWindow().UseConfig(config, rootpath)
     def ReadCustomization(self, config, rootpath=""):

diff --git a/wxPython/src/msw/html_wrap.cpp b/wxPython/src/msw/html_wrap.cpp
index ddbcea229165b90bacf596bd674ae07649896ffa..9b90cb6fa07e256b5ef2729c480e1ca3afadd55e 100644 (file)
--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -2544,118 +2544,119 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]
 #define SWIGTYPE_p_wxHtmlWinParser swig_types[82]
 #define SWIGTYPE_p_wxHtmlWindow swig_types[83]
 #define SWIGTYPE_p_wxHtmlWindowEvent swig_types[84]

-#define SWIGTYPE_p_wxHtmlWordCell swig_types[85]
-#define SWIGTYPE_p_wxICOHandler swig_types[86]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[87]
-#define SWIGTYPE_p_wxIdleEvent swig_types[88]
-#define SWIGTYPE_p_wxImage swig_types[89]
-#define SWIGTYPE_p_wxImageHandler swig_types[90]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[91]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[92]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[93]
-#define SWIGTYPE_p_wxKeyEvent swig_types[94]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[95]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[96]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[97]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[98]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[99]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[100]
-#define SWIGTYPE_p_wxMenu swig_types[101]
-#define SWIGTYPE_p_wxMenuBar swig_types[102]
-#define SWIGTYPE_p_wxMenuEvent swig_types[103]
-#define SWIGTYPE_p_wxMenuItem swig_types[104]
-#define SWIGTYPE_p_wxMessageDialog swig_types[105]
-#define SWIGTYPE_p_wxMiniFrame swig_types[106]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[107]
-#define SWIGTYPE_p_wxMouseEvent swig_types[108]
-#define SWIGTYPE_p_wxMoveEvent swig_types[109]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[110]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[111]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[112]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[113]
-#define SWIGTYPE_p_wxObject swig_types[114]
-#define SWIGTYPE_p_wxPCXHandler swig_types[115]
-#define SWIGTYPE_p_wxPNGHandler swig_types[116]
-#define SWIGTYPE_p_wxPNMHandler swig_types[117]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[118]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[119]
-#define SWIGTYPE_p_wxPaintEvent swig_types[120]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[121]
-#define SWIGTYPE_p_wxPanel swig_types[122]
-#define SWIGTYPE_p_wxPaperSize swig_types[123]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[124]
-#define SWIGTYPE_p_wxPoint swig_types[125]
-#define SWIGTYPE_p_wxPopupWindow swig_types[126]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[127]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[128]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[129]
-#define SWIGTYPE_p_wxPrintData swig_types[130]
-#define SWIGTYPE_p_wxPrintDialog swig_types[131]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[132]
-#define SWIGTYPE_p_wxPrintPreview swig_types[133]
-#define SWIGTYPE_p_wxPrinter swig_types[134]
-#define SWIGTYPE_p_wxProgressDialog swig_types[135]
-#define SWIGTYPE_p_wxPyApp swig_types[136]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[137]
-#define SWIGTYPE_p_wxPyEvent swig_types[138]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[139]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[140]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[141]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[142]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[143]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[144]
-#define SWIGTYPE_p_wxPyPanel swig_types[145]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[146]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[147]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[148]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[149]
-#define SWIGTYPE_p_wxPyPrintout swig_types[150]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[151]
-#define SWIGTYPE_p_wxPySizer swig_types[152]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[153]
-#define SWIGTYPE_p_wxPyVListBox swig_types[154]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[155]
-#define SWIGTYPE_p_wxPyValidator swig_types[156]
-#define SWIGTYPE_p_wxPyWindow swig_types[157]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[158]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[159]
-#define SWIGTYPE_p_wxSashEvent swig_types[160]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[161]
-#define SWIGTYPE_p_wxSashWindow swig_types[162]
-#define SWIGTYPE_p_wxScrollEvent swig_types[163]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[164]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[165]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[166]
-#define SWIGTYPE_p_wxShowEvent swig_types[167]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[168]
-#define SWIGTYPE_p_wxSize swig_types[169]
-#define SWIGTYPE_p_wxSizeEvent swig_types[170]
-#define SWIGTYPE_p_wxSizer swig_types[171]
-#define SWIGTYPE_p_wxSizerItem swig_types[172]
-#define SWIGTYPE_p_wxSplashScreen swig_types[173]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[174]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[175]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[176]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[177]
-#define SWIGTYPE_p_wxStatusBar swig_types[178]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[179]
-#define SWIGTYPE_p_wxString swig_types[180]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[181]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[182]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[183]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[184]
-#define SWIGTYPE_p_wxTipWindow swig_types[185]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[186]
-#define SWIGTYPE_p_wxTreeCtrl swig_types[187]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[188]
-#define SWIGTYPE_p_wxValidator swig_types[189]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[190]
-#define SWIGTYPE_p_wxWindow swig_types[191]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[192]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[193]
-#define SWIGTYPE_p_wxXPMHandler swig_types[194]
-static swig_type_info *swig_types[196];
-static swig_module_info swig_module = {swig_types, 195, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[85]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[86]
+#define SWIGTYPE_p_wxICOHandler swig_types[87]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[88]
+#define SWIGTYPE_p_wxIdleEvent swig_types[89]
+#define SWIGTYPE_p_wxImage swig_types[90]
+#define SWIGTYPE_p_wxImageHandler swig_types[91]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[92]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[93]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[94]
+#define SWIGTYPE_p_wxKeyEvent swig_types[95]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[96]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[97]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[98]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[99]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[100]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[101]
+#define SWIGTYPE_p_wxMenu swig_types[102]
+#define SWIGTYPE_p_wxMenuBar swig_types[103]
+#define SWIGTYPE_p_wxMenuEvent swig_types[104]
+#define SWIGTYPE_p_wxMenuItem swig_types[105]
+#define SWIGTYPE_p_wxMessageDialog swig_types[106]
+#define SWIGTYPE_p_wxMiniFrame swig_types[107]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[108]
+#define SWIGTYPE_p_wxMouseEvent swig_types[109]
+#define SWIGTYPE_p_wxMoveEvent swig_types[110]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[111]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[112]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[113]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[114]
+#define SWIGTYPE_p_wxObject swig_types[115]
+#define SWIGTYPE_p_wxPCXHandler swig_types[116]
+#define SWIGTYPE_p_wxPNGHandler swig_types[117]
+#define SWIGTYPE_p_wxPNMHandler swig_types[118]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[119]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[120]
+#define SWIGTYPE_p_wxPaintEvent swig_types[121]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[122]
+#define SWIGTYPE_p_wxPanel swig_types[123]
+#define SWIGTYPE_p_wxPaperSize swig_types[124]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[125]
+#define SWIGTYPE_p_wxPoint swig_types[126]
+#define SWIGTYPE_p_wxPopupWindow swig_types[127]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[128]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[129]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[130]
+#define SWIGTYPE_p_wxPrintData swig_types[131]
+#define SWIGTYPE_p_wxPrintDialog swig_types[132]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[133]
+#define SWIGTYPE_p_wxPrintPreview swig_types[134]
+#define SWIGTYPE_p_wxPrinter swig_types[135]
+#define SWIGTYPE_p_wxProgressDialog swig_types[136]
+#define SWIGTYPE_p_wxPyApp swig_types[137]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[138]
+#define SWIGTYPE_p_wxPyEvent swig_types[139]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[140]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[141]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[142]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[144]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[145]
+#define SWIGTYPE_p_wxPyPanel swig_types[146]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[147]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[148]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[149]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[150]
+#define SWIGTYPE_p_wxPyPrintout swig_types[151]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[152]
+#define SWIGTYPE_p_wxPySizer swig_types[153]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[154]
+#define SWIGTYPE_p_wxPyVListBox swig_types[155]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[156]
+#define SWIGTYPE_p_wxPyValidator swig_types[157]
+#define SWIGTYPE_p_wxPyWindow swig_types[158]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[159]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[160]
+#define SWIGTYPE_p_wxSashEvent swig_types[161]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[162]
+#define SWIGTYPE_p_wxSashWindow swig_types[163]
+#define SWIGTYPE_p_wxScrollEvent swig_types[164]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[165]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[166]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[167]
+#define SWIGTYPE_p_wxShowEvent swig_types[168]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[169]
+#define SWIGTYPE_p_wxSize swig_types[170]
+#define SWIGTYPE_p_wxSizeEvent swig_types[171]
+#define SWIGTYPE_p_wxSizer swig_types[172]
+#define SWIGTYPE_p_wxSizerItem swig_types[173]
+#define SWIGTYPE_p_wxSplashScreen swig_types[174]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[175]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[176]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[177]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[178]
+#define SWIGTYPE_p_wxStatusBar swig_types[179]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[180]
+#define SWIGTYPE_p_wxString swig_types[181]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[182]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[183]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[184]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[185]
+#define SWIGTYPE_p_wxTipWindow swig_types[186]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[187]
+#define SWIGTYPE_p_wxTreeCtrl swig_types[188]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[189]
+#define SWIGTYPE_p_wxValidator swig_types[190]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[191]
+#define SWIGTYPE_p_wxWindow swig_types[192]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[193]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[194]
+#define SWIGTYPE_p_wxXPMHandler swig_types[195]
+static swig_type_info *swig_types[197];
+static swig_module_info swig_module = {swig_types, 196, 0, 0, 0, 0};

 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 


@@ -3070,14 +3071,15 @@ public:
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
 
     DEC_PYCALLBACK__STRING(OnSetTitle);
     DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);

-    DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
+    DEC_PYCALLBACK_BOOL_CELLINTINTME(OnCellClicked);
+

     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
     PYPRIVATE;
 };
 
 IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
 IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
 IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);

-IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
+IMP_PYCALLBACK_BOOL_CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);

 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
 
 
 void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {


@@ -4225,6 +4227,54 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlParser_GetInnerSource(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlParser *arg1 = (wxHtmlParser *) 0 ;
+  wxHtmlTag *arg2 = 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "tag", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlParser_GetInnerSource",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "1"" of type '" "wxHtmlParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlParser * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxHtmlTag,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlParser_GetInnerSource" "', expected argument " "2"" of type '" "wxHtmlTag const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlTag * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (arg1)->GetInnerSource((wxHtmlTag const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlParser_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -4418,6 +4468,34 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWinParser_GetWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
+  wxHtmlWindowInterface *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWinParser, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWinParser_GetWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWinParser *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWinParser * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlWindowInterface *)(arg1)->GetWindowInterface();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlWinParser_SetFonts(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlWinParser *arg1 = (wxHtmlWinParser *) 0 ;


@@ -7150,6 +7228,45 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_GetMouseCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxCursor result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_GetMouseCursor",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetMouseCursor" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetMouseCursor(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_GetCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7614,6 +7731,66 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlCell_ProcessMouseClick(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlWindowInterface *arg2 = (wxHtmlWindowInterface *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxMouseEvent *arg4 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window",(char *) "pos",(char *) "event", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlCell_ProcessMouseClick",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "1"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "2"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlWindowInterface * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxMouseEvent,  0  | 0);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlCell_ProcessMouseClick" "', expected argument " "4"" of type '" "wxMouseEvent const &""'"); 
+  }
+  arg4 = reinterpret_cast< wxMouseEvent * >(argp4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->ProcessMouseClick(arg2,(wxPoint const &)*arg3,(wxMouseEvent const &)*arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
 SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;


@@ -7825,28 +8002,71 @@ fail:
 }
 
 
 }
 
 

-SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_HtmlCell_GetAbsPos(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {

   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
   PyObject *resultobj = 0;
   wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;

+  wxHtmlCell *arg2 = (wxHtmlCell *) NULL ;

   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;
   wxPoint result;
   void *argp1 = 0 ;
   int res1 = 0 ;

+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "rootCell", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:HtmlCell_GetAbsPos",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
+  if (obj1) {
+    res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+    }
+    arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlCell const *)arg1)->GetAbsPos(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlCell_GetRootCell(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
+  wxHtmlCell *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;

   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
   PyObject *swig_obj[1] ;
   
   if (!args) SWIG_fail;
   swig_obj[0] = args;
   res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
   if (!SWIG_IsOK(res1)) {

-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetAbsPos" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_GetRootCell" "', expected argument " "1"" of type '" "wxHtmlCell const *""'"); 

   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   }
   arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    result = ((wxHtmlCell const *)arg1)->GetAbsPos();
+    result = (wxHtmlCell *)((wxHtmlCell const *)arg1)->GetRootCell();

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }

   return resultobj;
 fail:
   return NULL;
   return resultobj;
 fail:
   return NULL;


@@ -9078,6 +9298,312 @@ SWIGINTERN PyObject *HtmlFilter_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObjec
   return SWIG_Python_InitShadowInstance(args);
 }
 
   return SWIG_Python_InitShadowInstance(args);
 }
 

+SWIGINTERN PyObject *_wrap_delete_HtmlWindowInterface(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_HtmlWindowInterface" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    delete arg1;
+    
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLWindowTitle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "title", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLWindowTitle",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLWindowTitle" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLWindowTitle((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_HTMLCoordsToWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxHtmlCell *arg2 = (wxHtmlCell *) 0 ;
+  wxPoint *arg3 = 0 ;
+  wxPoint result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  wxPoint temp3 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "cell",(char *) "pos", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:HtmlWindowInterface_HTMLCoordsToWindow",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_HTMLCoordsToWindow" "', expected argument " "2"" of type '" "wxHtmlCell *""'"); 
+  }
+  arg2 = reinterpret_cast< wxHtmlCell * >(argp2);
+  {
+    arg3 = &temp3;
+    if ( ! wxPoint_helper(obj2, &arg3)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->HTMLCoordsToWindow(arg2,(wxPoint const &)*arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxPoint(static_cast< const wxPoint& >(result))), SWIGTYPE_p_wxPoint, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLWindow" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)(arg1)->GetHTMLWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_GetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_GetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxHtmlWindowInterface const *)arg1)->GetHTMLBackgroundColour();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxColour(static_cast< const wxColour& >(result))), SWIGTYPE_p_wxColour, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxColour *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  wxColour temp2 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "clr", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundColour",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundColour" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = &temp2;
+    if ( ! wxColour_helper(obj1, &arg2)) SWIG_fail;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundColour((wxColour const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLBackgroundImage(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxBitmap *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "bmpBg", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLBackgroundImage",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxBitmap,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "HtmlWindowInterface_SetHTMLBackgroundImage" "', expected argument " "2"" of type '" "wxBitmap const &""'"); 
+  }
+  arg2 = reinterpret_cast< wxBitmap * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLBackgroundImage((wxBitmap const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindowInterface_SetHTMLStatusText(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxHtmlWindowInterface *arg1 = (wxHtmlWindowInterface *) 0 ;
+  wxString *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "text", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlWindowInterface_SetHTMLStatusText",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlWindowInterface, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindowInterface_SetHTMLStatusText" "', expected argument " "1"" of type '" "wxHtmlWindowInterface *""'"); 
+  }
+  arg1 = reinterpret_cast< wxHtmlWindowInterface * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetHTMLStatusText((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *HtmlWindowInterface_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj;
+  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_wxHtmlWindowInterface, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+

 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;
 SWIGINTERN PyObject *_wrap_new_HtmlWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxWindow *arg1 = (wxWindow *) 0 ;


@@ -10689,6 +11215,7 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;
   int arg3 ;
   int arg4 ;
   wxMouseEvent *arg5 = 0 ;

+  bool result;

   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;


@@ -10739,13 +11266,86 @@ SWIGINTERN PyObject *_wrap_HtmlWindow_OnCellClicked(PyObject *SWIGUNUSEDPARM(sel
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
   arg5 = reinterpret_cast< wxMouseEvent * >(argp5);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();

-    (arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);
+    result = (bool)(arg1)->OnCellClicked(arg2,arg3,arg4,(wxMouseEvent const &)*arg5);

     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_HtmlWindow_OnOpeningURL(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow *arg1 = (wxPyHtmlWindow *) 0 ;
+  wxHtmlURLType arg2 ;
+  wxString *arg3 = 0 ;
+  wxString *arg4 = (wxString *) 0 ;
+  wxHtmlOpeningStatus result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  bool temp3 = false ;
+  bool temp4 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "type",(char *) "url",(char *) "redirect", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:HtmlWindow_OnOpeningURL",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxPyHtmlWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "1"" of type '" "wxPyHtmlWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyHtmlWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "HtmlWindow_OnOpeningURL" "', expected argument " "2"" of type '" "wxHtmlURLType""'");
+  } 
+  arg2 = static_cast< wxHtmlURLType >(val2);
+  {
+    arg3 = wxString_in_helper(obj2);
+    if (arg3 == NULL) SWIG_fail;
+    temp3 = true;
+  }
+  {
+    arg4 = wxString_in_helper(obj3);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxHtmlOpeningStatus)((wxPyHtmlWindow const *)arg1)->OnOpeningURL(arg2,(wxString const &)*arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return resultobj;
 fail:
   return resultobj;
 fail:

+  {
+    if (temp3)
+    delete arg3;
+  }
+  {
+    if (temp4)
+    delete arg4;
+  }

   return NULL;
 }
 
   return NULL;
 }
 


@@ -10783,6 +11383,36 @@ fail:
 }
 
 
 }
 
 

+SWIGINTERN PyObject *_wrap_HtmlWindow_GetDefaultHTMLCursor(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxPyHtmlWindow::HTMLCursor arg1 ;
+  wxCursor result;
+  int val1 ;
+  int ecode1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "type", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:HtmlWindow_GetDefaultHTMLCursor",kwnames,&obj0)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "HtmlWindow_GetDefaultHTMLCursor" "', expected argument " "1"" of type '" "wxPyHtmlWindow::HTMLCursor""'");
+  } 
+  arg1 = static_cast< wxPyHtmlWindow::HTMLCursor >(val1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxPyHtmlWindow::GetDefaultHTMLCursor(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxCursor(static_cast< const wxCursor& >(result))), SWIGTYPE_p_wxCursor, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+

 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
 SWIGINTERN PyObject *HtmlWindow_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;


@@ -16931,6 +17561,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},
         { (char *)"HtmlParser_GetSource", (PyCFunction)_wrap_HtmlParser_GetSource, METH_O, NULL},
         { (char *)"HtmlParser_PushTagHandler", (PyCFunction) _wrap_HtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_PopTagHandler", (PyCFunction)_wrap_HtmlParser_PopTagHandler, METH_O, NULL},

+        { (char *)"HtmlParser_GetInnerSource", (PyCFunction) _wrap_HtmlParser_GetInnerSource, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlParser_swigregister", HtmlParser_swigregister, METH_VARARGS, NULL},
         { (char *)"new_HtmlWinParser", (PyCFunction) _wrap_new_HtmlWinParser, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetDC", (PyCFunction) _wrap_HtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -16938,6 +17569,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharHeight", (PyCFunction)_wrap_HtmlWinParser_GetCharHeight, METH_O, NULL},
         { (char *)"HtmlWinParser_GetCharWidth", (PyCFunction)_wrap_HtmlWinParser_GetCharWidth, METH_O, NULL},
         { (char *)"HtmlWinParser_GetWindow", (PyCFunction)_wrap_HtmlWinParser_GetWindow, METH_O, NULL},

+        { (char *)"HtmlWinParser_GetWindowInterface", (PyCFunction)_wrap_HtmlWinParser_GetWindowInterface, METH_O, NULL},

         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},
         { (char *)"HtmlWinParser_SetFonts", (PyCFunction) _wrap_HtmlWinParser_SetFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_SetStandardFonts", (PyCFunction) _wrap_HtmlWinParser_SetStandardFonts, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWinParser_GetContainer", (PyCFunction)_wrap_HtmlWinParser_GetContainer, METH_O, NULL},


@@ -17033,6 +17665,7 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},
         { (char *)"HtmlCell_GetNext", (PyCFunction)_wrap_HtmlCell_GetNext, METH_O, NULL},
         { (char *)"HtmlCell_GetParent", (PyCFunction)_wrap_HtmlCell_GetParent, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstChild", (PyCFunction)_wrap_HtmlCell_GetFirstChild, METH_O, NULL},

+        { (char *)"HtmlCell_GetMouseCursor", (PyCFunction) _wrap_HtmlCell_GetMouseCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_GetCursor", (PyCFunction)_wrap_HtmlCell_GetCursor, METH_O, NULL},
         { (char *)"HtmlCell_IsFormattingCell", (PyCFunction)_wrap_HtmlCell_IsFormattingCell, METH_O, NULL},
         { (char *)"HtmlCell_SetLink", (PyCFunction) _wrap_HtmlCell_SetLink, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17043,12 +17676,14 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Draw", (PyCFunction) _wrap_HtmlCell_Draw, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlCell_ProcessMouseClick", (PyCFunction) _wrap_HtmlCell_ProcessMouseClick, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
         { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
         { (char *)"HtmlCell_FindCellByPos", (PyCFunction) _wrap_HtmlCell_FindCellByPos, METH_VARARGS | METH_KEYWORDS, NULL},

-        { (char *)"HtmlCell_GetAbsPos", (PyCFunction)_wrap_HtmlCell_GetAbsPos, METH_O, NULL},
+        { (char *)"HtmlCell_GetAbsPos", (PyCFunction) _wrap_HtmlCell_GetAbsPos, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlCell_GetRootCell", (PyCFunction)_wrap_HtmlCell_GetRootCell, METH_O, NULL},

         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},
         { (char *)"HtmlCell_GetFirstTerminal", (PyCFunction)_wrap_HtmlCell_GetFirstTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetLastTerminal", (PyCFunction)_wrap_HtmlCell_GetLastTerminal, METH_O, NULL},
         { (char *)"HtmlCell_GetDepth", (PyCFunction)_wrap_HtmlCell_GetDepth, METH_O, NULL},


@@ -17094,6 +17729,15 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},
         { (char *)"HtmlFilter__setCallbackInfo", (PyCFunction) _wrap_HtmlFilter__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlFilter_swigregister", HtmlFilter_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlFilter_swiginit", HtmlFilter_swiginit, METH_VARARGS, NULL},

+        { (char *)"delete_HtmlWindowInterface", (PyCFunction)_wrap_delete_HtmlWindowInterface, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLWindowTitle", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLWindowTitle, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_HTMLCoordsToWindow", (PyCFunction) _wrap_HtmlWindowInterface_HTMLCoordsToWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLWindow", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLWindow, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_GetHTMLBackgroundColour", (PyCFunction)_wrap_HtmlWindowInterface_GetHTMLBackgroundColour, METH_O, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundColour", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundColour, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLBackgroundImage", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLBackgroundImage, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_SetHTMLStatusText", (PyCFunction) _wrap_HtmlWindowInterface_SetHTMLStatusText, METH_VARARGS | METH_KEYWORDS, NULL},
+        { (char *)"HtmlWindowInterface_swigregister", HtmlWindowInterface_swigregister, METH_VARARGS, NULL},

         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_HtmlWindow", (PyCFunction) _wrap_new_HtmlWindow, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"new_PreHtmlWindow", (PyCFunction)_wrap_new_PreHtmlWindow, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_Create", (PyCFunction) _wrap_HtmlWindow_Create, METH_VARARGS | METH_KEYWORDS, NULL},


@@ -17133,7 +17777,9 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnSetTitle", (PyCFunction) _wrap_HtmlWindow_OnSetTitle, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellMouseHover", (PyCFunction) _wrap_HtmlWindow_OnCellMouseHover, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_OnCellClicked", (PyCFunction) _wrap_HtmlWindow_OnCellClicked, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_OnOpeningURL", (PyCFunction) _wrap_HtmlWindow_OnOpeningURL, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},
         { (char *)"HtmlWindow_GetClassDefaultAttributes", (PyCFunction) _wrap_HtmlWindow_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL},

+        { (char *)"HtmlWindow_GetDefaultHTMLCursor", (PyCFunction) _wrap_HtmlWindow_GetDefaultHTMLCursor, METH_VARARGS | METH_KEYWORDS, NULL},

         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},
         { (char *)"HtmlWindow_swigregister", HtmlWindow_swigregister, METH_VARARGS, NULL},
         { (char *)"HtmlWindow_swiginit", HtmlWindow_swiginit, METH_VARARGS, NULL},
         { (char *)"new_HtmlDCRenderer", (PyCFunction)_wrap_new_HtmlDCRenderer, METH_NOARGS, NULL},


@@ -18572,6 +19218,7 @@ static swig_type_info _swigt__p_wxHtmlWidgetCell = {"_p_wxHtmlWidgetCell", "wxHt
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWinParser = {"_p_wxHtmlWinParser", "wxHtmlWinParser *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindow = {"_p_wxHtmlWindow", "wxHtmlWindow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWindowEvent = {"_p_wxHtmlWindowEvent", "wxHtmlWindowEvent *", 0, 0, (void*)0, 0};

+static swig_type_info _swigt__p_wxHtmlWindowInterface = {"_p_wxHtmlWindowInterface", "wxHtmlWindowInterface *", 0, 0, (void*)0, 0};

 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxHtmlWordCell = {"_p_wxHtmlWordCell", "wxHtmlWordCell *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMouseEvent = {"_p_wxMouseEvent", "wxMouseEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxNotifyEvent = {"_p_wxNotifyEvent", "wxNotifyEvent *", 0, 0, (void*)0, 0};


@@ -18720,6 +19367,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,
   &_swigt__p_wxHtmlWinParser,
   &_swigt__p_wxHtmlWindow,
   &_swigt__p_wxHtmlWindowEvent,

+  &_swigt__p_wxHtmlWindowInterface,

   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,
   &_swigt__p_wxHtmlWordCell,
   &_swigt__p_wxICOHandler,
   &_swigt__p_wxIconizeEvent,


@@ -18966,6 +19614,7 @@ static swig_cast_info _swigc__p_wxHtmlWidgetCell[] = {  {&_swigt__p_wxHtmlWidget
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWinParser[] = {  {&_swigt__p_wxHtmlWinParser, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindow[] = {  {&_swigt__p_wxHtmlWindow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWindowEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, 0, 0, 0},{0, 0, 0, 0}};

+static swig_cast_info _swigc__p_wxHtmlWindowInterface[] = {  {&_swigt__p_wxHtmlWindowInterface, 0, 0, 0},{0, 0, 0, 0}};

 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxHtmlWordCell[] = {  {&_swigt__p_wxHtmlWordCell, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMouseEvent[] = {  {&_swigt__p_wxMouseEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxNotifyEvent[] = {  {&_swigt__p_wxHtmlWindowEvent, _p_wxHtmlWindowEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxSplitterEvent, _p_wxSplitterEventTo_p_wxNotifyEvent, 0, 0},  {&_swigt__p_wxNotifyEvent, 0, 0, 0},{0, 0, 0, 0}};


@@ -19114,6 +19763,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,
   _swigc__p_wxHtmlWinParser,
   _swigc__p_wxHtmlWindow,
   _swigc__p_wxHtmlWindowEvent,

+  _swigc__p_wxHtmlWindowInterface,

   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,
   _swigc__p_wxHtmlWordCell,
   _swigc__p_wxICOHandler,
   _swigc__p_wxIconizeEvent,


@@ -19773,6 +20423,12 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));
   SWIG_Python_SetConstant(d, "HTML_FIND_EXACT",SWIG_From_int(static_cast< int >(wxHTML_FIND_EXACT)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_BEFORE",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_BEFORE)));
   SWIG_Python_SetConstant(d, "HTML_FIND_NEAREST_AFTER",SWIG_From_int(static_cast< int >(wxHTML_FIND_NEAREST_AFTER)));

+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindowInterface_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxHtmlWindowInterface::HTMLCursor_Text)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Default",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Default)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Link",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Link)));
+  SWIG_Python_SetConstant(d, "HtmlWindow_HTMLCursor_Text",SWIG_From_int(static_cast< int >(wxPyHtmlWindow::HTMLCursor_Text)));

   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));
   SWIG_Python_SetConstant(d, "PAGE_ODD",SWIG_From_int(static_cast< int >(wxPAGE_ODD)));
   SWIG_Python_SetConstant(d, "PAGE_EVEN",SWIG_From_int(static_cast< int >(wxPAGE_EVEN)));
   SWIG_Python_SetConstant(d, "PAGE_ALL",SWIG_From_int(static_cast< int >(wxPAGE_ALL)));