more updates for new directory structure

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

wxPython/contrib/buildall.py

@@ -17,13 +17,13 @@ sys.path.insert(0, '../distrib')
 import build
 
 MODULELIST = ['glcanvas', 'ogl', 'stc', ]
-
+sys.argv[0] = '../../distrib/build.py'
 
 
 for module in MODULELIST:
     cwd = os.getcwd()
     print "**** Building %s ****" % module
-    err = build.main(['../../distrib/build.py', '-C', module] + sys.argv[1:])
+    err = build.main([sys.argv[0], '-C', module] + sys.argv[1:])
     os.chdir(cwd)
     if err:
         break

wxPython/contrib/glcanvas/build.cfg

@@ -17,8 +17,9 @@ if sys.platform == 'win32':
 
 else:
 
-    print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
+    #print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
-          "         if you have native GL!"
+    #      "         if you have native GL!"
-    OTHERLIBS = "-lwx_gtk_gl -lMesaGL -lMesaGLU"
+    #OTHERLIBS = "-lwx_gtk_gl -lMesaGL -lMesaGLU"
+    OTHERLIBS = "-lwx_gtk_gl -lGL -lGLU"
 
 

wxPython/contrib/ogl/build.cfg

@@ -32,7 +32,7 @@ $(CPPFLAGS) /c /Tp $<
 '''
 else:
     OTHERCFLAGS = '-Icontrib/include'
-    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
+    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
     OTHERRULES = """
 %.o : contrib/src/ogl/%.cpp
 	$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<

wxPython/contrib/ogl/oglshapes.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : ./oglshapes.cpp
+ * FILE : oglshapes.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -1565,11 +1565,12 @@ static PyObject *_wrap_wxPseudoMetaFile_SetTextColour(PyObject *self, PyObject *
     wxPseudoMetaFile * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
+    wxColour  temp;
+    PyObject * _obj1 = 0;
     char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetTextColour",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetTextColour",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1578,13 +1579,11 @@ static PyObject *_wrap_wxPseudoMetaFile_SetTextColour(PyObject *self, PyObject *
         return NULL;
         }
     }
-    if (_argo1) {
+{
-        if (_argo1 == Py_None) { _arg1 = NULL; }
+    _arg1 = &temp;
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+    if (! wxColour_helper(_obj1, &_arg1))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_SetTextColour. Expected _wxColour_p.");
         return NULL;
 }
-    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxPseudoMetaFile_SetTextColour(_arg0,*_arg1);
@@ -1601,11 +1600,12 @@ static PyObject *_wrap_wxPseudoMetaFile_SetBackgroundColour(PyObject *self, PyOb
     wxPseudoMetaFile * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
+    wxColour  temp;
+    PyObject * _obj1 = 0;
     char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPseudoMetaFile_SetBackgroundColour",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1614,13 +1614,11 @@ static PyObject *_wrap_wxPseudoMetaFile_SetBackgroundColour(PyObject *self, PyOb
         return NULL;
         }
     }
-    if (_argo1) {
+{
-        if (_argo1 == Py_None) { _arg1 = NULL; }
+    _arg1 = &temp;
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+    if (! wxColour_helper(_obj1, &_arg1))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPseudoMetaFile_SetBackgroundColour. Expected _wxColour_p.");
         return NULL;
 }
-    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxPseudoMetaFile_SetBackgroundColour(_arg0,*_arg1);
@@ -5960,11 +5958,12 @@ static PyObject *_wrap_wxPyDrawnShape_SetDrawnBackgroundColour(PyObject *self, P
     wxPyDrawnShape * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
+    wxColour  temp;
+    PyObject * _obj1 = 0;
     char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetDrawnBackgroundColour",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetDrawnBackgroundColour",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5973,13 +5972,11 @@ static PyObject *_wrap_wxPyDrawnShape_SetDrawnBackgroundColour(PyObject *self, P
         return NULL;
         }
     }
-    if (_argo1) {
+{
-        if (_argo1 == Py_None) { _arg1 = NULL; }
+    _arg1 = &temp;
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+    if (! wxColour_helper(_obj1, &_arg1))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_SetDrawnBackgroundColour. Expected _wxColour_p.");
         return NULL;
 }
-    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxPyDrawnShape_SetDrawnBackgroundColour(_arg0,*_arg1);
@@ -6138,11 +6135,12 @@ static PyObject *_wrap_wxPyDrawnShape_SetDrawnTextColour(PyObject *self, PyObjec
     wxPyDrawnShape * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
-    PyObject * _argo1 = 0;
+    wxColour  temp;
+    PyObject * _obj1 = 0;
     char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetDrawnTextColour",_kwnames,&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyDrawnShape_SetDrawnTextColour",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6151,13 +6149,11 @@ static PyObject *_wrap_wxPyDrawnShape_SetDrawnTextColour(PyObject *self, PyObjec
         return NULL;
         }
     }
-    if (_argo1) {
+{
-        if (_argo1 == Py_None) { _arg1 = NULL; }
+    _arg1 = &temp;
-        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
+    if (! wxColour_helper(_obj1, &_arg1))
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxPyDrawnShape_SetDrawnTextColour. Expected _wxColour_p.");
         return NULL;
 }
-    }
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxPyDrawnShape_SetDrawnTextColour(_arg0,*_arg1);
@@ -12499,6 +12495,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
     { "_wxBMPHandler","_class_wxBMPHandler",0},
     { "_wxImage","_class_wxImage",0},
+    { "_wxFlexGridSizer","_class_wxFlexGridSizer",0},
     { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
@@ -12572,6 +12569,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxSizer","_wxSizer",0},
     { "_class_wxTIFFHandler","_wxTIFFHandler",0},
     { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_wxGridSizer","_class_wxGridSizer",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_class_wxClipboard","_wxClipboard",0},
     { "_class_wxGauge","_wxGauge",0},
@@ -12584,6 +12582,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxProgressDialog","_class_wxProgressDialog",0},
     { "_class_wxBMPHandler","_wxBMPHandler",0},
     { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
     { "_wxSpinEvent","_class_wxSpinEvent",0},
     { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
     { "_wxPyBitmapShape","_class_wxPyBitmapShape",0},
@@ -12766,6 +12765,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCaret","_wxCaret",0},
     { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
     { "_class_wxBrush","_wxBrush",0},
+    { "_wxTipProvider","_class_wxTipProvider",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_class_wxWindow","_wxWindow",0},
@@ -12853,8 +12853,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxPyTipProvider","_class_wxPyTipProvider",0},
     { "_wxFrame","_class_wxFrame",0},
     { "_wxPCXHandler","_class_wxPCXHandler",0},
+    { "_class_wxGridSizer","_wxGridSizer",0},
     { "_wxPyDivisionShape","_class_wxPyDivisionShape",0},
     { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
     { "_class_wxNotebook","_wxNotebook",0},
@@ -12939,6 +12941,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEraseEvent","_class_wxEraseEvent",0},
     { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxTipProvider","_wxTipProvider",0},
     { "_class_wxMiniFrame","_wxMiniFrame",0},
     { "_wxFontDialog","_class_wxFontDialog",0},
     { "_wxRegion","_class_wxRegion",0},
@@ -12946,6 +12949,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
     { "_wxSizer","_class_wxSizer",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_class_wxPyTipProvider","_wxPyTipProvider",0},
     { "_class_wxPCXHandler","_wxPCXHandler",0},
     { "_wxTIFFHandler","_class_wxTIFFHandler",0},
     { "_wxPyDropTarget","_class_wxPyDropTarget",0},

wxPython/contrib/stc/build.cfg

@@ -62,7 +62,7 @@ $(CPPFLAGS) /c /Tp $<
 '''
 
 else:
-    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET)'
+    DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
     OTHERDEFS = 'STCLOC = .'
     OTHERRULES = '''
 %.o : contrib/src/stc/%.cpp

wxPython/demo/Main.py

@@ -407,6 +407,7 @@ class MyApp(wxApp):
             showTip, index = eval(showTipText)
         except IOError:
             showTip, index = (1, 0)
+        print showTip, index
         if showTip:
             tp = wxCreateFileTipProvider("data/tips.txt", index)
             showTip = wxShowTip(frame, tp)

wxPython/distrib/maketgz

@@ -34,15 +34,12 @@ tar xf dist-temp.tar
 rm dist-temp.tar
 mv wxPython wxPython-$1
 rm wxPython-$1/src/gtk/helpers.cpp
+touch `find wxPython-$1 -name "*.cpp"`
+touch `find wxPython-$1 -name "*.py"`
+
 
 tar cvf wxPython-$1.tar wxPython-$1
 gzip wxPython-$1.tar
 
 rm -rf wxPython-$1
 
-
-
-
-
-
-

wxPython/distrib/wxPython.spec

@@ -35,13 +35,14 @@ cd ../modules/html
 python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../utils
 python ../../distrib/build.py -b WXPSRCDIR=../../src
-cd ../glcanvas
-python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../ogl
 python ../../distrib/build.py -b WXPSRCDIR=../../src
 cd ../stc
 python ../../distrib/build.py -b WXPSRCDIR=../../src
-
+if [ ! -z $NOGLCANVAS ]; then
+    cd ../glcanvas
+    python ../../distrib/build.py -b WXPSRCDIR=../../src
+fi
 
 %install
 cd src
@@ -50,12 +51,14 @@ cd ../modules/html
 python ../../distrib/build.py -i
 cd ../utils
 python ../../distrib/build.py -i
-cd ../glcanvas
-python ../../distrib/build.py -i
 cd ../ogl
 python ../../distrib/build.py -i
 cd ../stc
 python ../../distrib/build.py -i
+if [ ! -z $NOGLCANVAS ]; then
+    cd ../glcanvas
+    python ../../distrib/build.py -i
+fi
 
 
 %post
@@ -71,6 +74,3 @@ python ../../distrib/build.py -i
 
 
 
-
-
-

wxPython/src/build.cfg

@@ -37,7 +37,7 @@ __version__.py: ../distrib/build.py  build.cfg
 """
 
 else:
-    DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
+    DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
     OTHERINSTALLTARGETS = 'installLibDemo installHelpers '
     OTHERUNINSTALLTARGETS = 'uninstallLibDemo uninstallHelpers '
 

wxPython/src/gtk/controls2.cpp

@@ -4514,6 +4514,7 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args, PyObjec
 }
 
 static int  wxTreeItemId___cmp__(wxTreeItemId *self,wxTreeItemId * other) {
+            if (! other) return 0;
             return *self != *other;
         }
 static PyObject *_wrap_wxTreeItemId___cmp__(PyObject *self, PyObject *args, PyObject *kwargs) {

wxPython/src/gtk/grid.cpp

@@ -8511,6 +8511,35 @@ static PyObject *_wrap_wxGrid_GetGridLineColour(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
+#define wxGrid_GetCellHighlightColour(_swigobj)  (_swigobj->GetCellHighlightColour())
+static PyObject *_wrap_wxGrid_GetCellHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxColour * _result;
+    wxGrid * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCellHighlightColour",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCellHighlightColour. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxColour (wxGrid_GetCellHighlightColour(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}    SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
+    _resultobj = Py_BuildValue("s",_ptemp);
+    return _resultobj;
+}
+
 #define wxGrid_SetRowLabelSize(_swigobj,_swigarg0)  (_swigobj->SetRowLabelSize(_swigarg0))
 static PyObject *_wrap_wxGrid_SetRowLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -8848,6 +8877,41 @@ static PyObject *_wrap_wxGrid_SetGridLineColour(PyObject *self, PyObject *args,
     return _resultobj;
 }
 
+#define wxGrid_SetCellHighlightColour(_swigobj,_swigarg0)  (_swigobj->SetCellHighlightColour(_swigarg0))
+static PyObject *_wrap_wxGrid_SetCellHighlightColour(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxGrid * _arg0;
+    wxColour * _arg1;
+    PyObject * _argo0 = 0;
+    wxColour  temp;
+    PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","arg2", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetCellHighlightColour",_kwnames,&_argo0,&_obj1)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGrid_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetCellHighlightColour. Expected _wxGrid_p.");
+        return NULL;
+        }
+    }
+{
+    _arg1 = &temp;
+    if (! wxColour_helper(_obj1, &_arg1))
+        return NULL;
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxGrid_SetCellHighlightColour(_arg0,*_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 #define wxGrid_EnableDragRowSize(_swigobj,_swigarg0)  (_swigobj->EnableDragRowSize(_swigarg0))
 static PyObject *_wrap_wxGrid_EnableDragRowSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -12464,6 +12528,7 @@ static PyMethodDef gridcMethods[] = {
 	 { "wxGrid_CanDragRowSize", (PyCFunction) _wrap_wxGrid_CanDragRowSize, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_DisableDragRowSize", (PyCFunction) _wrap_wxGrid_DisableDragRowSize, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_EnableDragRowSize", (PyCFunction) _wrap_wxGrid_EnableDragRowSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellHighlightColour", (PyCFunction) _wrap_wxGrid_SetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_SetGridLineColour", (PyCFunction) _wrap_wxGrid_SetGridLineColour, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_SetColLabelValue", (PyCFunction) _wrap_wxGrid_SetColLabelValue, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_SetRowLabelValue", (PyCFunction) _wrap_wxGrid_SetRowLabelValue, METH_VARARGS | METH_KEYWORDS },
@@ -12474,6 +12539,7 @@ static PyMethodDef gridcMethods[] = {
 	 { "wxGrid_SetLabelBackgroundColour", (PyCFunction) _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_SetColLabelSize", (PyCFunction) _wrap_wxGrid_SetColLabelSize, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_SetRowLabelSize", (PyCFunction) _wrap_wxGrid_SetRowLabelSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellHighlightColour", (PyCFunction) _wrap_wxGrid_GetCellHighlightColour, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetGridLineColour", (PyCFunction) _wrap_wxGrid_GetGridLineColour, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetColLabelValue", (PyCFunction) _wrap_wxGrid_GetColLabelValue, METH_VARARGS | METH_KEYWORDS },
 	 { "wxGrid_GetRowLabelValue", (PyCFunction) _wrap_wxGrid_GetRowLabelValue, METH_VARARGS | METH_KEYWORDS },

wxPython/src/gtk/grid.py

@@ -1018,6 +1018,10 @@ class wxGridPtr(wxScrolledWindowPtr):
         val = apply(gridc.wxGrid_GetGridLineColour,(self,) + _args, _kwargs)
         if val: val = wxColourPtr(val) ; val.thisown = 1
         return val
+    def GetCellHighlightColour(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_GetCellHighlightColour,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) ; val.thisown = 1
+        return val
     def SetRowLabelSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetRowLabelSize,(self,) + _args, _kwargs)
         return val
@@ -1048,6 +1052,9 @@ class wxGridPtr(wxScrolledWindowPtr):
     def SetGridLineColour(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_SetGridLineColour,(self,) + _args, _kwargs)
         return val
+    def SetCellHighlightColour(self, *_args, **_kwargs):
+        val = apply(gridc.wxGrid_SetCellHighlightColour,(self,) + _args, _kwargs)
+        return val
     def EnableDragRowSize(self, *_args, **_kwargs):
         val = apply(gridc.wxGrid_EnableDragRowSize,(self,) + _args, _kwargs)
         return val

wxPython/src/gtk/html.py

@@ -0,0 +1,743 @@
+# This file was created automatically by SWIG.
+import htmlc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+import wx
+class wxHtmlLinkInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetHref(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetHref,(self,) + _args, _kwargs)
+        return val
+    def GetTarget(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetTarget,(self,) + _args, _kwargs)
+        return val
+    def GetEvent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetEvent,(self,) + _args, _kwargs)
+        if val: val = wxMouseEventPtr(val) 
+        return val
+    def GetHtmlCell(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlLinkInfo_GetHtmlCell,(self,) + _args, _kwargs)
+        if val: val = wxHtmlCellPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlLinkInfo instance at %s>" % (self.this,)
+class wxHtmlLinkInfo(wxHtmlLinkInfoPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlLinkInfo,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlTagPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetName(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetName,(self,) + _args, _kwargs)
+        return val
+    def HasParam(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_HasParam,(self,) + _args, _kwargs)
+        return val
+    def GetParam(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetParam,(self,) + _args, _kwargs)
+        return val
+    def GetAllParams(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetAllParams,(self,) + _args, _kwargs)
+        return val
+    def IsEnding(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_IsEnding,(self,) + _args, _kwargs)
+        return val
+    def HasEnding(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_HasEnding,(self,) + _args, _kwargs)
+        return val
+    def GetBeginPos(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetBeginPos,(self,) + _args, _kwargs)
+        return val
+    def GetEndPos1(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetEndPos1,(self,) + _args, _kwargs)
+        return val
+    def GetEndPos2(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTag_GetEndPos2,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlTag instance at %s>" % (self.this,)
+class wxHtmlTag(wxHtmlTagPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlParserPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetFS(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_SetFS,(self,) + _args, _kwargs)
+        return val
+    def GetFS(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_GetFS,(self,) + _args, _kwargs)
+        return val
+    def Parse(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_Parse,(self,) + _args, _kwargs)
+        return val
+    def InitParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_InitParser,(self,) + _args, _kwargs)
+        return val
+    def DoneParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_DoneParser,(self,) + _args, _kwargs)
+        return val
+    def DoParsing(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_DoParsing,(self,) + _args, _kwargs)
+        return val
+    def AddTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_AddTagHandler,(self,) + _args, _kwargs)
+        return val
+    def GetSource(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_GetSource,(self,) + _args, _kwargs)
+        return val
+    def PushTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_PushTagHandler,(self,) + _args, _kwargs)
+        return val
+    def PopTagHandler(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlParser_PopTagHandler,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlParser instance at %s>" % (self.this,)
+class wxHtmlParser(wxHtmlParserPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlWinParserPtr(wxHtmlParserPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def SetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetDC,(self,) + _args, _kwargs)
+        return val
+    def GetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetDC,(self,) + _args, _kwargs)
+        if val: val = wxDCPtr(val) 
+        return val
+    def GetCharHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetCharHeight,(self,) + _args, _kwargs)
+        return val
+    def GetCharWidth(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetCharWidth,(self,) + _args, _kwargs)
+        return val
+    def GetWindow(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetWindow,(self,) + _args, _kwargs)
+        if val: val = wxWindowPtr(val) 
+        return val
+    def SetFonts(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFonts,(self,) + _args, _kwargs)
+        return val
+    def GetContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetContainer,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def OpenContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_OpenContainer,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def SetContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetContainer,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def CloseContainer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_CloseContainer,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def GetFontSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontSize,(self,) + _args, _kwargs)
+        return val
+    def SetFontSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontSize,(self,) + _args, _kwargs)
+        return val
+    def GetFontBold(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontBold,(self,) + _args, _kwargs)
+        return val
+    def SetFontBold(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontBold,(self,) + _args, _kwargs)
+        return val
+    def GetFontItalic(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontItalic,(self,) + _args, _kwargs)
+        return val
+    def SetFontItalic(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontItalic,(self,) + _args, _kwargs)
+        return val
+    def GetFontUnderlined(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontUnderlined,(self,) + _args, _kwargs)
+        return val
+    def SetFontUnderlined(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontUnderlined,(self,) + _args, _kwargs)
+        return val
+    def GetFontFixed(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetFontFixed,(self,) + _args, _kwargs)
+        return val
+    def SetFontFixed(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetFontFixed,(self,) + _args, _kwargs)
+        return val
+    def GetAlign(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetAlign,(self,) + _args, _kwargs)
+        return val
+    def SetAlign(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetAlign,(self,) + _args, _kwargs)
+        return val
+    def GetLinkColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLinkColor,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def SetLinkColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetLinkColor,(self,) + _args, _kwargs)
+        return val
+    def GetActualColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetActualColor,(self,) + _args, _kwargs)
+        if val: val = wxColourPtr(val) 
+        return val
+    def SetActualColor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetActualColor,(self,) + _args, _kwargs)
+        return val
+    def SetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_SetLink,(self,) + _args, _kwargs)
+        return val
+    def CreateCurrentFont(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_CreateCurrentFont,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) 
+        return val
+    def GetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinParser_GetLink,(self,) + _args, _kwargs)
+        if val: val = wxHtmlLinkInfoPtr(val) ; val.thisown = 1
+        return val
+    def __repr__(self):
+        return "<C wxHtmlWinParser instance at %s>" % (self.this,)
+class wxHtmlWinParser(wxHtmlWinParserPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWinParser,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlTagHandlerPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_SetParser,(self,) + _args, _kwargs)
+        return val
+    def GetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_GetParser,(self,) + _args, _kwargs)
+        if val: val = wxHtmlParserPtr(val) 
+        return val
+    def ParseInner(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlTagHandler_ParseInner,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlTagHandler instance at %s>" % (self.this,)
+class wxHtmlTagHandler(wxHtmlTagHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlTagHandler,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxHtmlTagHandler)
+
+
+
+
+class wxHtmlWinTagHandlerPtr(wxHtmlTagHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_SetParser,(self,) + _args, _kwargs)
+        return val
+    def GetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_GetParser,(self,) + _args, _kwargs)
+        if val: val = wxHtmlWinParserPtr(val) 
+        return val
+    def ParseInner(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWinTagHandler_ParseInner,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlWinTagHandler instance at %s>" % (self.this,)
+class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWinTagHandler,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxHtmlWinTagHandler)
+
+
+
+
+class wxHtmlCellPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetPosX(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetPosX,(self,) + _args, _kwargs)
+        return val
+    def GetPosY(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetPosY,(self,) + _args, _kwargs)
+        return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def GetDescent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetDescent,(self,) + _args, _kwargs)
+        return val
+    def GetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetLink,(self,) + _args, _kwargs)
+        if val: val = wxHtmlLinkInfoPtr(val) 
+        return val
+    def GetNext(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetNext,(self,) + _args, _kwargs)
+        if val: val = wxHtmlCellPtr(val) 
+        return val
+    def GetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_GetParent,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def SetLink(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetLink,(self,) + _args, _kwargs)
+        return val
+    def SetNext(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetNext,(self,) + _args, _kwargs)
+        return val
+    def SetParent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetParent,(self,) + _args, _kwargs)
+        return val
+    def SetPos(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetPos,(self,) + _args, _kwargs)
+        return val
+    def Layout(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_Layout,(self,) + _args, _kwargs)
+        return val
+    def Draw(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_Draw,(self,) + _args, _kwargs)
+        return val
+    def DrawInvisible(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_DrawInvisible,(self,) + _args, _kwargs)
+        return val
+    def Find(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_Find,(self,) + _args, _kwargs)
+        if val: val = wxHtmlCellPtr(val) 
+        return val
+    def AdjustPagebreak(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_AdjustPagebreak,(self,) + _args, _kwargs)
+        return val
+    def SetCanLiveOnPagebreak(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlCell_SetCanLiveOnPagebreak,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlCell instance at %s>" % (self.this,)
+class wxHtmlCell(wxHtmlCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlContainerCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def InsertCell(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_InsertCell,(self,) + _args, _kwargs)
+        return val
+    def SetAlignHor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetAlignHor,(self,) + _args, _kwargs)
+        return val
+    def GetAlignHor(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_GetAlignHor,(self,) + _args, _kwargs)
+        return val
+    def SetAlignVer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetAlignVer,(self,) + _args, _kwargs)
+        return val
+    def GetAlignVer(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_GetAlignVer,(self,) + _args, _kwargs)
+        return val
+    def SetIndent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetIndent,(self,) + _args, _kwargs)
+        return val
+    def GetIndent(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_GetIndent,(self,) + _args, _kwargs)
+        return val
+    def GetIndentUnits(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_GetIndentUnits,(self,) + _args, _kwargs)
+        return val
+    def SetAlign(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetAlign,(self,) + _args, _kwargs)
+        return val
+    def SetWidthFloat(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetWidthFloat,(self,) + _args, _kwargs)
+        return val
+    def SetWidthFloatFromTag(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetWidthFloatFromTag,(self,) + _args, _kwargs)
+        return val
+    def SetMinHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetMinHeight,(self,) + _args, _kwargs)
+        return val
+    def SetBackgroundColour(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetBackgroundColour,(self,) + _args, _kwargs)
+        return val
+    def SetBorder(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_SetBorder,(self,) + _args, _kwargs)
+        return val
+    def GetFirstCell(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlContainerCell_GetFirstCell,(self,) + _args, _kwargs)
+        if val: val = wxHtmlCellPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlContainerCell instance at %s>" % (self.this,)
+class wxHtmlContainerCell(wxHtmlContainerCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlContainerCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlColourCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxHtmlColourCell instance at %s>" % (self.this,)
+class wxHtmlColourCell(wxHtmlColourCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlColourCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlWidgetCellPtr(wxHtmlCellPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxHtmlWidgetCell instance at %s>" % (self.this,)
+class wxHtmlWidgetCell(wxHtmlWidgetCellPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWidgetCell,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class HtmlHistoryItemPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetPos(self, *_args, **_kwargs):
+        val = apply(htmlc.HtmlHistoryItem_GetPos,(self,) + _args, _kwargs)
+        return val
+    def SetPos(self, *_args, **_kwargs):
+        val = apply(htmlc.HtmlHistoryItem_SetPos,(self,) + _args, _kwargs)
+        return val
+    def GetPage(self, *_args, **_kwargs):
+        val = apply(htmlc.HtmlHistoryItem_GetPage,(self,) + _args, _kwargs)
+        return val
+    def GetAnchor(self, *_args, **_kwargs):
+        val = apply(htmlc.HtmlHistoryItem_GetAnchor,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C HtmlHistoryItem instance at %s>" % (self.this,)
+class HtmlHistoryItem(HtmlHistoryItemPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_HtmlHistoryItem,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlWindowPtr(wxScrolledWindowPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def _setSelf(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow__setSelf,(self,) + _args, _kwargs)
+        return val
+    def SetPage(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetPage,(self,) + _args, _kwargs)
+        return val
+    def LoadPage(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_LoadPage,(self,) + _args, _kwargs)
+        return val
+    def GetOpenedPage(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetOpenedPage,(self,) + _args, _kwargs)
+        return val
+    def SetRelatedFrame(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetRelatedFrame,(self,) + _args, _kwargs)
+        return val
+    def GetRelatedFrame(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetRelatedFrame,(self,) + _args, _kwargs)
+        if val: val = wxFramePtr(val) 
+        return val
+    def SetRelatedStatusBar(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetRelatedStatusBar,(self,) + _args, _kwargs)
+        return val
+    def SetFonts(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetFonts,(self,) + _args, _kwargs)
+        return val
+    def SetTitle(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetTitle,(self,) + _args, _kwargs)
+        return val
+    def SetBorders(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_SetBorders,(self,) + _args, _kwargs)
+        return val
+    def ReadCustomization(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_ReadCustomization,(self,) + _args, _kwargs)
+        return val
+    def WriteCustomization(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_WriteCustomization,(self,) + _args, _kwargs)
+        return val
+    def HistoryBack(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_HistoryBack,(self,) + _args, _kwargs)
+        return val
+    def HistoryForward(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_HistoryForward,(self,) + _args, _kwargs)
+        return val
+    def HistoryClear(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_HistoryClear,(self,) + _args, _kwargs)
+        return val
+    def GetInternalRepresentation(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetInternalRepresentation,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContainerCellPtr(val) 
+        return val
+    def GetParser(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_GetParser,(self,) + _args, _kwargs)
+        if val: val = wxHtmlWinParserPtr(val) 
+        return val
+    def base_OnLinkClicked(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnLinkClicked,(self,) + _args, _kwargs)
+        return val
+    def base_OnSetTitle(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlWindow_base_OnSetTitle,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlWindow instance at %s>" % (self.this,)
+class wxHtmlWindow(wxHtmlWindowPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlWindow,_args,_kwargs)
+        self.thisown = 1
+        self._setSelf(self, wxHtmlWindow)
+        wx._StdWindowCallbacks(self)
+        wx._StdOnScrollCallbacks(self)
+
+
+
+
+class wxHtmlDCRendererPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlDCRenderer(self)
+    def SetDC(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetDC,(self,) + _args, _kwargs)
+        return val
+    def SetSize(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetSize,(self,) + _args, _kwargs)
+        return val
+    def SetHtmlText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_SetHtmlText,(self,) + _args, _kwargs)
+        return val
+    def Render(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_Render,(self,) + _args, _kwargs)
+        return val
+    def GetTotalHeight(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlDCRenderer_GetTotalHeight,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlDCRenderer instance at %s>" % (self.this,)
+class wxHtmlDCRenderer(wxHtmlDCRendererPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlDCRenderer,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlPrintoutPtr(wxPrintoutPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlPrintout(self)
+    def SetHtmlText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHtmlText,(self,) + _args, _kwargs)
+        return val
+    def SetHtmlFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHtmlFile,(self,) + _args, _kwargs)
+        return val
+    def SetHeader(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetHeader,(self,) + _args, _kwargs)
+        return val
+    def SetFooter(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetFooter,(self,) + _args, _kwargs)
+        return val
+    def SetMargins(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlPrintout_SetMargins,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlPrintout instance at %s>" % (self.this,)
+class wxHtmlPrintout(wxHtmlPrintoutPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlPrintout,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlEasyPrintingPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlc=htmlc):
+        if self.thisown == 1 :
+            htmlc.delete_wxHtmlEasyPrinting(self)
+    def PreviewFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PreviewFile,(self,) + _args, _kwargs)
+        return val
+    def PreviewText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PreviewText,(self,) + _args, _kwargs)
+        return val
+    def PrintFile(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrintFile,(self,) + _args, _kwargs)
+        return val
+    def PrintText(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrintText,(self,) + _args, _kwargs)
+        return val
+    def PrinterSetup(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PrinterSetup,(self,) + _args, _kwargs)
+        return val
+    def PageSetup(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_PageSetup,(self,) + _args, _kwargs)
+        return val
+    def SetHeader(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_SetHeader,(self,) + _args, _kwargs)
+        return val
+    def SetFooter(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_SetFooter,(self,) + _args, _kwargs)
+        return val
+    def GetPrintData(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_GetPrintData,(self,) + _args, _kwargs)
+        if val: val = wxPrintDataPtr(val) 
+        return val
+    def GetPageSetupData(self, *_args, **_kwargs):
+        val = apply(htmlc.wxHtmlEasyPrinting_GetPageSetupData,(self,) + _args, _kwargs)
+        if val: val = wxPageSetupDialogDataPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlEasyPrinting instance at %s>" % (self.this,)
+class wxHtmlEasyPrinting(wxHtmlEasyPrintingPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlc.new_wxHtmlEasyPrinting,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+wxHtmlWinParser_AddTagHandler = htmlc.wxHtmlWinParser_AddTagHandler
+
+wxHtmlWindow_AddFilter = htmlc.wxHtmlWindow_AddFilter
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+wxHTML_ALIGN_LEFT = htmlc.wxHTML_ALIGN_LEFT
+wxHTML_ALIGN_CENTER = htmlc.wxHTML_ALIGN_CENTER
+wxHTML_ALIGN_RIGHT = htmlc.wxHTML_ALIGN_RIGHT
+wxHTML_ALIGN_BOTTOM = htmlc.wxHTML_ALIGN_BOTTOM
+wxHTML_ALIGN_TOP = htmlc.wxHTML_ALIGN_TOP
+wxHTML_CLR_FOREGROUND = htmlc.wxHTML_CLR_FOREGROUND
+wxHTML_CLR_BACKGROUND = htmlc.wxHTML_CLR_BACKGROUND
+wxHTML_UNITS_PIXELS = htmlc.wxHTML_UNITS_PIXELS
+wxHTML_UNITS_PERCENT = htmlc.wxHTML_UNITS_PERCENT
+wxHTML_INDENT_LEFT = htmlc.wxHTML_INDENT_LEFT
+wxHTML_INDENT_RIGHT = htmlc.wxHTML_INDENT_RIGHT
+wxHTML_INDENT_TOP = htmlc.wxHTML_INDENT_TOP
+wxHTML_INDENT_BOTTOM = htmlc.wxHTML_INDENT_BOTTOM
+wxHTML_INDENT_HORIZONTAL = htmlc.wxHTML_INDENT_HORIZONTAL
+wxHTML_INDENT_VERTICAL = htmlc.wxHTML_INDENT_VERTICAL
+wxHTML_INDENT_ALL = htmlc.wxHTML_INDENT_ALL
+wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR
+wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
+wxHTML_COND_USER = htmlc.wxHTML_COND_USER
+wxPAGE_ODD = htmlc.wxPAGE_ODD
+wxPAGE_EVEN = htmlc.wxPAGE_EVEN
+wxPAGE_ALL = htmlc.wxPAGE_ALL
+
+
+#-------------- USER INCLUDE -----------------------
+
+
+# Stuff these names into the wx namespace so wxPyConstructObject can find them
+import wx
+wx.wxHtmlTagPtr             = wxHtmlTagPtr
+wx.wxHtmlParserPtr          = wxHtmlParserPtr
+wx.wxHtmlWinParserPtr       = wxHtmlWinParserPtr
+wx.wxHtmlTagHandlerPtr      = wxHtmlTagHandlerPtr
+wx.wxHtmlWinTagHandlerPtr   = wxHtmlWinTagHandlerPtr
+wx.wxHtmlCellPtr            = wxHtmlCellPtr
+wx.wxHtmlContainerCellPtr   = wxHtmlContainerCellPtr
+wx.wxHtmlWidgetCellPtr      = wxHtmlWidgetCellPtr
+wx.HtmlHistoryItemPtr       = HtmlHistoryItemPtr
+wx.wxHtmlWindowPtr          = wxHtmlWindowPtr
+wx.wxHtmlLinkInfoPtr        = wxHtmlLinkInfoPtr

wxPython/src/gtk/htmlhelp.py

@@ -0,0 +1,356 @@
+# This file was created automatically by SWIG.
+import htmlhelpc
+
+from misc import *
+
+from misc2 import *
+
+from windows import *
+
+from gdi import *
+
+from clip_dnd import *
+
+from events import *
+
+from mdi import *
+
+from frames import *
+
+from stattool import *
+
+from controls import *
+
+from controls2 import *
+
+from windows2 import *
+
+from cmndlgs import *
+
+from windows3 import *
+
+from image import *
+
+from printfw import *
+
+from sizers import *
+class wxHtmlHelpFrameCfgPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __setattr__(self,name,value):
+        if name == "x" :
+            htmlhelpc.wxHtmlHelpFrameCfg_x_set(self,value)
+            return
+        if name == "y" :
+            htmlhelpc.wxHtmlHelpFrameCfg_y_set(self,value)
+            return
+        if name == "w" :
+            htmlhelpc.wxHtmlHelpFrameCfg_w_set(self,value)
+            return
+        if name == "h" :
+            htmlhelpc.wxHtmlHelpFrameCfg_h_set(self,value)
+            return
+        if name == "sashpos" :
+            htmlhelpc.wxHtmlHelpFrameCfg_sashpos_set(self,value)
+            return
+        if name == "navig_on" :
+            htmlhelpc.wxHtmlHelpFrameCfg_navig_on_set(self,value)
+            return
+        self.__dict__[name] = value
+    def __getattr__(self,name):
+        if name == "x" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_x_get(self)
+        if name == "y" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_y_get(self)
+        if name == "w" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_w_get(self)
+        if name == "h" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_h_get(self)
+        if name == "sashpos" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_sashpos_get(self)
+        if name == "navig_on" : 
+            return htmlhelpc.wxHtmlHelpFrameCfg_navig_on_get(self)
+        raise AttributeError,name
+    def __repr__(self):
+        return "<C wxHtmlHelpFrameCfg instance at %s>" % (self.this,)
+class wxHtmlHelpFrameCfg(wxHtmlHelpFrameCfgPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpFrameCfg,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlBookRecordPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetTitle(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_GetTitle,(self,) + _args, _kwargs)
+        return val
+    def GetStart(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_GetStart,(self,) + _args, _kwargs)
+        return val
+    def GetBasePath(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_GetBasePath,(self,) + _args, _kwargs)
+        return val
+    def SetContentsRange(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_SetContentsRange,(self,) + _args, _kwargs)
+        return val
+    def GetContentsStart(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsStart,(self,) + _args, _kwargs)
+        return val
+    def GetContentsEnd(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlBookRecord_GetContentsEnd,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlBookRecord instance at %s>" % (self.this,)
+class wxHtmlBookRecord(wxHtmlBookRecordPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlBookRecord,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlContentsItemPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __setattr__(self,name,value):
+        if name == "m_Level" :
+            htmlhelpc.wxHtmlContentsItem_m_Level_set(self,value)
+            return
+        if name == "m_ID" :
+            htmlhelpc.wxHtmlContentsItem_m_ID_set(self,value)
+            return
+        if name == "m_Name" :
+            htmlhelpc.wxHtmlContentsItem_m_Name_set(self,value)
+            return
+        if name == "m_Page" :
+            htmlhelpc.wxHtmlContentsItem_m_Page_set(self,value)
+            return
+        if name == "m_Book" :
+            htmlhelpc.wxHtmlContentsItem_m_Book_set(self,value.this)
+            return
+        self.__dict__[name] = value
+    def __getattr__(self,name):
+        if name == "m_Level" : 
+            return htmlhelpc.wxHtmlContentsItem_m_Level_get(self)
+        if name == "m_ID" : 
+            return htmlhelpc.wxHtmlContentsItem_m_ID_get(self)
+        if name == "m_Name" : 
+            return htmlhelpc.wxHtmlContentsItem_m_Name_get(self)
+        if name == "m_Page" : 
+            return htmlhelpc.wxHtmlContentsItem_m_Page_get(self)
+        if name == "m_Book" : 
+            return wxHtmlBookRecordPtr(htmlhelpc.wxHtmlContentsItem_m_Book_get(self))
+        raise AttributeError,name
+    def __repr__(self):
+        return "<C wxHtmlContentsItem instance at %s>" % (self.this,)
+class wxHtmlContentsItem(wxHtmlContentsItemPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlSearchStatusPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Search(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_Search,(self,) + _args, _kwargs)
+        return val
+    def IsActive(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_IsActive,(self,) + _args, _kwargs)
+        return val
+    def GetCurIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_GetCurIndex,(self,) + _args, _kwargs)
+        return val
+    def GetMaxIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_GetMaxIndex,(self,) + _args, _kwargs)
+        return val
+    def GetName(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_GetName,(self,) + _args, _kwargs)
+        return val
+    def GetContentsItem(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlSearchStatus_GetContentsItem,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContentsItemPtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlSearchStatus instance at %s>" % (self.this,)
+class wxHtmlSearchStatus(wxHtmlSearchStatusPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxHtmlHelpDataPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlhelpc=htmlhelpc):
+        if self.thisown == 1 :
+            htmlhelpc.delete_wxHtmlHelpData(self)
+    def SetTempDir(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_SetTempDir,(self,) + _args, _kwargs)
+        return val
+    def AddBook(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_AddBook,(self,) + _args, _kwargs)
+        return val
+    def FindPageByName(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_FindPageByName,(self,) + _args, _kwargs)
+        return val
+    def FindPageById(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_FindPageById,(self,) + _args, _kwargs)
+        return val
+    def GetBookRecArray(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_GetBookRecArray,(self,) + _args, _kwargs)
+        return val
+    def GetContents(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_GetContents,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContentsItemPtr(val) 
+        return val
+    def GetContentsCnt(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_GetContentsCnt,(self,) + _args, _kwargs)
+        return val
+    def GetIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_GetIndex,(self,) + _args, _kwargs)
+        if val: val = wxHtmlContentsItemPtr(val) 
+        return val
+    def GetIndexCnt(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpData_GetIndexCnt,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlHelpData instance at %s>" % (self.this,)
+class wxHtmlHelpData(wxHtmlHelpDataPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpData,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlHelpFramePtr(wxFramePtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def GetData(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_GetData,(self,) + _args, _kwargs)
+        if val: val = wxHtmlHelpDataPtr(val) 
+        return val
+    def SetTitleFormat(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_SetTitleFormat,(self,) + _args, _kwargs)
+        return val
+    def Display(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_Display,(self,) + _args, _kwargs)
+        return val
+    def DisplayID(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayID,(self,) + _args, _kwargs)
+        return val
+    def DisplayContents(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayContents,(self,) + _args, _kwargs)
+        return val
+    def DisplayIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_DisplayIndex,(self,) + _args, _kwargs)
+        return val
+    def KeywordSearch(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_KeywordSearch,(self,) + _args, _kwargs)
+        return val
+    def UseConfig(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_UseConfig,(self,) + _args, _kwargs)
+        return val
+    def ReadCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_ReadCustomization,(self,) + _args, _kwargs)
+        return val
+    def WriteCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpFrame_WriteCustomization,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxHtmlHelpFrame instance at %s>" % (self.this,)
+class wxHtmlHelpFrame(wxHtmlHelpFramePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpFrame,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxHtmlHelpControllerPtr(wxEvtHandlerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,htmlhelpc=htmlhelpc):
+        if self.thisown == 1 :
+            htmlhelpc.delete_wxHtmlHelpController(self)
+    def SetTitleFormat(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_SetTitleFormat,(self,) + _args, _kwargs)
+        return val
+    def SetTempDir(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_SetTempDir,(self,) + _args, _kwargs)
+        return val
+    def AddBook(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_AddBook,(self,) + _args, _kwargs)
+        return val
+    def Display(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_Display,(self,) + _args, _kwargs)
+        return val
+    def DisplayID(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayID,(self,) + _args, _kwargs)
+        return val
+    def DisplayContents(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayContents,(self,) + _args, _kwargs)
+        return val
+    def DisplayIndex(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_DisplayIndex,(self,) + _args, _kwargs)
+        return val
+    def KeywordSearch(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_KeywordSearch,(self,) + _args, _kwargs)
+        return val
+    def UseConfig(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_UseConfig,(self,) + _args, _kwargs)
+        return val
+    def ReadCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_ReadCustomization,(self,) + _args, _kwargs)
+        return val
+    def WriteCustomization(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_WriteCustomization,(self,) + _args, _kwargs)
+        return val
+    def GetFrame(self, *_args, **_kwargs):
+        val = apply(htmlhelpc.wxHtmlHelpController_GetFrame,(self,) + _args, _kwargs)
+        if val: val = wxHtmlHelpFramePtr(val) 
+        return val
+    def __repr__(self):
+        return "<C wxHtmlHelpController instance at %s>" % (self.this,)
+class wxHtmlHelpController(wxHtmlHelpControllerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(htmlhelpc.new_wxHtmlHelpController,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+
+wxID_HTML_PANEL = htmlhelpc.wxID_HTML_PANEL
+wxID_HTML_BACK = htmlhelpc.wxID_HTML_BACK
+wxID_HTML_FORWARD = htmlhelpc.wxID_HTML_FORWARD
+wxID_HTML_TREECTRL = htmlhelpc.wxID_HTML_TREECTRL
+wxID_HTML_INDEXPAGE = htmlhelpc.wxID_HTML_INDEXPAGE
+wxID_HTML_INDEXLIST = htmlhelpc.wxID_HTML_INDEXLIST
+wxID_HTML_NOTEBOOK = htmlhelpc.wxID_HTML_NOTEBOOK
+wxID_HTML_SEARCHPAGE = htmlhelpc.wxID_HTML_SEARCHPAGE
+wxID_HTML_SEARCHTEXT = htmlhelpc.wxID_HTML_SEARCHTEXT
+wxID_HTML_SEARCHLIST = htmlhelpc.wxID_HTML_SEARCHLIST
+wxID_HTML_SEARCHBUTTON = htmlhelpc.wxID_HTML_SEARCHBUTTON
+wxID_HTML_SEARCHCHOICE = htmlhelpc.wxID_HTML_SEARCHCHOICE
+wxID_HTML_HELPFRAME = htmlhelpc.wxID_HTML_HELPFRAME

wxPython/src/gtk/misc2.cpp

@@ -58,6 +58,7 @@ extern PyObject *SWIG_newvarlink(void);
 #include <wx/tooltip.h>
 #include <wx/caret.h>
 #include <wx/fontenum.h>
+#include <wx/tipdlg.h>
 
 static PyObject* l_output_helper(PyObject* target, PyObject* o) {
     PyObject*   o2;
@@ -151,6 +152,19 @@ public:
 IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
 IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);
 
+
+class wxPyTipProvider : public wxTipProvider {
+public:
+    wxPyTipProvider(size_t currentTip)
+        : wxTipProvider(currentTip) {}
+
+    DEC_PYCALLBACK_STRING__pure(GetTip);
+
+    PYPRIVATE;
+};
+
+IMP_PYCALLBACK_STRING__pure( wxPyTipProvider, wxTipProvider, GetTip);
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1153,6 +1167,82 @@ static PyObject *_wrap_wxWakeUpIdle(PyObject *self, PyObject *args, PyObject *kw
     return _resultobj;
 }
 
+static PyObject *_wrap_wxShowTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    bool  _result;
+    wxWindow * _arg0;
+    wxTipProvider * _arg1;
+    bool  _arg2 = (bool ) TRUE;
+    PyObject * _argo0 = 0;
+    PyObject * _argo1 = 0;
+    int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "parent","tipProvider","showAtStartup", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxShowTip",_kwnames,&_argo0,&_argo1,&tempbool2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxShowTip. Expected _wxWindow_p.");
+        return NULL;
+        }
+    }
+    if (_argo1) {
+        if (_argo1 == Py_None) { _arg1 = NULL; }
+        else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxTipProvider_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxShowTip. Expected _wxTipProvider_p.");
+        return NULL;
+        }
+    }
+    _arg2 = (bool ) tempbool2;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (bool )wxShowTip(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+static PyObject *_wrap_wxCreateFileTipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTipProvider * _result;
+    wxString * _arg0;
+    size_t  _arg1;
+    PyObject * _obj0 = 0;
+    char *_kwnames[] = { "filename","currentTip", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCreateFileTipProvider",_kwnames,&_obj0,&_arg1)) 
+        return NULL;
+{
+    if (!PyString_Check(_obj0)) {
+        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
+        return NULL;
+    }
+    _arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
+}
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxTipProvider *)wxCreateFileTipProvider(*_arg0,_arg1);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTipProvider_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+{
+    if (_obj0)
+        delete _arg0;
+}
+    return _resultobj;
+}
+
 #define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0))
 static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -2068,7 +2158,131 @@ static PyObject *_wrap_delete_wxBusyCursor(PyObject *self, PyObject *args, PyObj
     return _resultobj;
 }
 
+#define delete_wxTipProvider(_swigobj) (delete _swigobj)
+static PyObject *_wrap_delete_wxTipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxTipProvider * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxTipProvider",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTipProvider_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTipProvider. Expected _wxTipProvider_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        delete_wxTipProvider(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+#define wxTipProvider_GetTip(_swigobj)  (_swigobj->GetTip())
+static PyObject *_wrap_wxTipProvider_GetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxString * _result;
+    wxTipProvider * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTipProvider_GetTip",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTipProvider_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTipProvider_GetTip. Expected _wxTipProvider_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = new wxString (wxTipProvider_GetTip(_arg0));
+
+    wxPy_END_ALLOW_THREADS;
+}{
+    _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
+}
+{
+    delete _result;
+}
+    return _resultobj;
+}
+
+#define wxTipProvider_GetCurrentTip(_swigobj)  (_swigobj->GetCurrentTip())
+static PyObject *_wrap_wxTipProvider_GetCurrentTip(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    size_t  _result;
+    wxTipProvider * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTipProvider_GetCurrentTip",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTipProvider_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTipProvider_GetCurrentTip. Expected _wxTipProvider_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (size_t )wxTipProvider_GetCurrentTip(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    _resultobj = Py_BuildValue("i",_result);
+    return _resultobj;
+}
+
+static void *SwigwxPyTipProviderTowxTipProvider(void *ptr) {
+    wxPyTipProvider *src;
+    wxTipProvider *dest;
+    src = (wxPyTipProvider *) ptr;
+    dest = (wxTipProvider *) src;
+    return (void *) dest;
+}
+
+#define new_wxPyTipProvider(_swigarg0) (new wxPyTipProvider(_swigarg0))
+static PyObject *_wrap_new_wxPyTipProvider(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxPyTipProvider * _result;
+    size_t  _arg0;
+    char *_kwnames[] = { "currentTip", NULL };
+    char _ptemp[128];
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:new_wxPyTipProvider",_kwnames,&_arg0)) 
+        return NULL;
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (wxPyTipProvider *)new_wxPyTipProvider(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    if (_result) {
+        SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyTipProvider_p");
+        _resultobj = Py_BuildValue("s",_ptemp);
+    } else {
+        Py_INCREF(Py_None);
+        _resultobj = Py_None;
+    }
+    return _resultobj;
+}
+
 static PyMethodDef misc2cMethods[] = {
+	 { "new_wxPyTipProvider", (PyCFunction) _wrap_new_wxPyTipProvider, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTipProvider_GetCurrentTip", (PyCFunction) _wrap_wxTipProvider_GetCurrentTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTipProvider_GetTip", (PyCFunction) _wrap_wxTipProvider_GetTip, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxTipProvider", (PyCFunction) _wrap_delete_wxTipProvider, METH_VARARGS | METH_KEYWORDS },
 	 { "delete_wxBusyCursor", (PyCFunction) _wrap_delete_wxBusyCursor, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxBusyCursor", (PyCFunction) _wrap_new_wxBusyCursor, METH_VARARGS | METH_KEYWORDS },
 	 { "wxFontEnumerator_GetFacenames", (PyCFunction) _wrap_wxFontEnumerator_GetFacenames, METH_VARARGS | METH_KEYWORDS },
@@ -2097,6 +2311,8 @@ static PyMethodDef misc2cMethods[] = {
 	 { "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
 	 { "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCreateFileTipProvider", (PyCFunction) _wrap_wxCreateFileTipProvider, METH_VARARGS | METH_KEYWORDS },
+	 { "wxShowTip", (PyCFunction) _wrap_wxShowTip, METH_VARARGS | METH_KEYWORDS },
 	 { "wxWakeUpIdle", (PyCFunction) _wrap_wxWakeUpIdle, METH_VARARGS | METH_KEYWORDS },
 	 { "wxPostEvent", (PyCFunction) _wrap_wxPostEvent, METH_VARARGS | METH_KEYWORDS },
 	 { "wxCaret_SetBlinkTime", (PyCFunction) _wrap_wxCaret_SetBlinkTime, METH_VARARGS | METH_KEYWORDS },
@@ -2275,6 +2491,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxDropTarget","_wxDropTarget",0},
     { "_class_wxCaret","_wxCaret",0},
     { "_class_wxBrush","_wxBrush",0},
+    { "_wxTipProvider","_class_wxPyTipProvider",SwigwxPyTipProviderTowxTipProvider},
+    { "_wxTipProvider","_wxPyTipProvider",SwigwxPyTipProviderTowxTipProvider},
+    { "_wxTipProvider","_class_wxTipProvider",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_class_wxWindow","_wxWindow",0},
@@ -2322,6 +2541,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxScrollEvent","_wxScrollEvent",0},
     { "_wxJoystickEvent","_class_wxJoystickEvent",0},
     { "_class_wxImageList","_wxImageList",0},
+    { "_wxPyTipProvider","_class_wxPyTipProvider",0},
     { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
     { "_wxWindowID","_wxCoord",0},
     { "_wxWindowID","_wxPrintQuality",0},
@@ -2371,8 +2591,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEraseEvent","_class_wxEraseEvent",0},
     { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxTipProvider","_class_wxPyTipProvider",SwigwxPyTipProviderTowxTipProvider},
+    { "_class_wxTipProvider","_wxPyTipProvider",SwigwxPyTipProviderTowxTipProvider},
+    { "_class_wxTipProvider","_wxTipProvider",0},
     { "_wxRegion","_class_wxRegion",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_class_wxPyTipProvider","_wxPyTipProvider",0},
     { "_wxPyDropTarget","_class_wxPyDropTarget",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_class_wxBusyInfo","_wxBusyInfo",0},

wxPython/src/gtk/misc2.py

@@ -143,6 +143,42 @@ class wxBusyCursor(wxBusyCursorPtr):
 
 
 
+class wxTipProviderPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,misc2c=misc2c):
+        if self.thisown == 1 :
+            misc2c.delete_wxTipProvider(self)
+    def GetTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxTipProvider_GetTip,(self,) + _args, _kwargs)
+        return val
+    def GetCurrentTip(self, *_args, **_kwargs):
+        val = apply(misc2c.wxTipProvider_GetCurrentTip,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxTipProvider instance at %s>" % (self.this,)
+class wxTipProvider(wxTipProviderPtr):
+    def __init__(self,this):
+        self.this = this
+
+
+
+
+class wxPyTipProviderPtr(wxTipProviderPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __repr__(self):
+        return "<C wxPyTipProvider instance at %s>" % (self.this,)
+class wxPyTipProvider(wxPyTipProviderPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(misc2c.new_wxPyTipProvider,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------
@@ -233,6 +269,13 @@ wxPostEvent = misc2c.wxPostEvent
 
 wxWakeUpIdle = misc2c.wxWakeUpIdle
 
+wxShowTip = misc2c.wxShowTip
+
+def wxCreateFileTipProvider(*_args, **_kwargs):
+    val = apply(misc2c.wxCreateFileTipProvider,_args,_kwargs)
+    if val: val = wxTipProviderPtr(val); val.thisown = 1
+    return val
+
 
 
 #-------------- VARIABLE WRAPPERS ------------------

wxPython/src/gtk/sizers.py

@@ -54,10 +54,16 @@ class wxSizerItemPtr :
         val = apply(sizersc.wxSizerItem_GetWindow,(self,) + _args, _kwargs)
         if val: val = wxWindowPtr(val) 
         return val
+    def SetWindow(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizerItem_SetWindow,(self,) + _args, _kwargs)
+        return val
     def GetSizer(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetSizer,(self,) + _args, _kwargs)
         if val: val = wxSizerPtr(val) 
         return val
+    def SetSizer(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizerItem_SetSizer,(self,) + _args, _kwargs)
+        return val
     def GetOption(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizerItem_GetOption,(self,) + _args, _kwargs)
         return val
@@ -107,6 +113,15 @@ class wxSizerPtr :
     def AddSpacer(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_AddSpacer,(self,) + _args, _kwargs)
         return val
+    def InsertWindow(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_InsertWindow,(self,) + _args, _kwargs)
+        return val
+    def InsertSizer(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_InsertSizer,(self,) + _args, _kwargs)
+        return val
+    def InsertSpacer(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_InsertSpacer,(self,) + _args, _kwargs)
+        return val
     def PrependWindow(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_PrependWindow,(self,) + _args, _kwargs)
         return val
@@ -128,6 +143,18 @@ class wxSizerPtr :
     def SetDimension(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_SetDimension,(self,) + _args, _kwargs)
         return val
+    def SetMinSize(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_SetMinSize,(self,) + _args, _kwargs)
+        return val
+    def SetItemMinSizeWindow(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_SetItemMinSizeWindow,(self,) + _args, _kwargs)
+        return val
+    def SetItemMinSizeSizer(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_SetItemMinSizeSizer,(self,) + _args, _kwargs)
+        return val
+    def SetItemMinSizePos(self, *_args, **_kwargs):
+        val = apply(sizersc.wxSizer_SetItemMinSizePos,(self,) + _args, _kwargs)
+        return val
     def GetSize(self, *_args, **_kwargs):
         val = apply(sizersc.wxSizer_GetSize,(self,) + _args, _kwargs)
         if val: val = wxSizePtr(val) ; val.thisown = 1
@@ -163,6 +190,14 @@ class wxSizerPtr :
         else:
             apply(self.AddWindow, args)
 
+    def Insert(self, *args):
+        if type(args[0]) == type(1):
+            apply(self.InsertSpacer, args)
+        elif string.find(args[0].this, 'Sizer') != -1:
+            apply(self.InsertSizer, args)
+        else:
+            apply(self.InsertWindow, args)
+
     def Prepend(self, *args):
         if type(args[0]) == type(1):
             apply(self.PrependSpacer, args)
@@ -185,6 +220,15 @@ class wxSizerPtr :
                 childinfo = (childinfo, )
             apply(self.Add, childinfo)
 
+    
+    def SetItemMinSize(self, *args):
+        if type(args[0]) == type(1):
+            apply(self.SetItemMinSizePos, args)
+        elif string.find(args[0].this, 'Sizer') != -1:
+            apply(self.SetItemMinSizeSizer, args)
+        else:
+            apply(self.SetItemMinSizeWindow, args)
+     
 class wxSizer(wxSizerPtr):
     def __init__(self,this):
         self.this = this
@@ -284,6 +328,84 @@ class wxNotebookSizer(wxNotebookSizerPtr):
 
 
 
+class wxGridSizerPtr(wxSizerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def RecalcSizes(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_RecalcSizes,(self,) + _args, _kwargs)
+        return val
+    def CalcMin(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_CalcMin,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def SetCols(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_SetCols,(self,) + _args, _kwargs)
+        return val
+    def SetRows(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_SetRows,(self,) + _args, _kwargs)
+        return val
+    def SetVGap(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_SetVGap,(self,) + _args, _kwargs)
+        return val
+    def SetHGap(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_SetHGap,(self,) + _args, _kwargs)
+        return val
+    def GetCols(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_GetCols,(self,) + _args, _kwargs)
+        return val
+    def GetRows(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_GetRows,(self,) + _args, _kwargs)
+        return val
+    def GetVGap(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_GetVGap,(self,) + _args, _kwargs)
+        return val
+    def GetHGap(self, *_args, **_kwargs):
+        val = apply(sizersc.wxGridSizer_GetHGap,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxGridSizer instance at %s>" % (self.this,)
+class wxGridSizer(wxGridSizerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(sizersc.new_wxGridSizer,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxFlexGridSizerPtr(wxGridSizerPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def RecalcSizes(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_RecalcSizes,(self,) + _args, _kwargs)
+        return val
+    def CalcMin(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_CalcMin,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def AddGrowableRow(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_AddGrowableRow,(self,) + _args, _kwargs)
+        return val
+    def RemoveGrowableRow(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_RemoveGrowableRow,(self,) + _args, _kwargs)
+        return val
+    def AddGrowableCol(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_AddGrowableCol,(self,) + _args, _kwargs)
+        return val
+    def RemoveGrowableCol(self, *_args, **_kwargs):
+        val = apply(sizersc.wxFlexGridSizer_RemoveGrowableCol,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxFlexGridSizer instance at %s>" % (self.this,)
+class wxFlexGridSizer(wxFlexGridSizerPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(sizersc.new_wxFlexGridSizer,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
 
 
 #-------------- FUNCTION WRAPPERS ------------------

wxPython/src/gtk/utils.py

@@ -0,0 +1,111 @@
+# This file was created automatically by SWIG.
+import utilsc
+class wxConfigPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,utilsc=utilsc):
+        if self.thisown == 1 :
+            utilsc.delete_wxConfig(self)
+    def DontCreateOnDemand(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DontCreateOnDemand,(self,) + _args, _kwargs)
+        return val
+    def DeleteAll(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteAll,(self,) + _args, _kwargs)
+        return val
+    def DeleteEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteEntry,(self,) + _args, _kwargs)
+        return val
+    def DeleteGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_DeleteGroup,(self,) + _args, _kwargs)
+        return val
+    def Exists(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Exists,(self,) + _args, _kwargs)
+        return val
+    def Flush(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Flush,(self,) + _args, _kwargs)
+        return val
+    def GetAppName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetAppName,(self,) + _args, _kwargs)
+        return val
+    def GetFirstGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstGroup,(self,) + _args, _kwargs)
+        return val
+    def GetFirstEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetFirstEntry,(self,) + _args, _kwargs)
+        return val
+    def GetNextGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextGroup,(self,) + _args, _kwargs)
+        return val
+    def GetNextEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNextEntry,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfEntries(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfEntries,(self,) + _args, _kwargs)
+        return val
+    def GetNumberOfGroups(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetNumberOfGroups,(self,) + _args, _kwargs)
+        return val
+    def GetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetPath,(self,) + _args, _kwargs)
+        return val
+    def GetVendorName(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_GetVendorName,(self,) + _args, _kwargs)
+        return val
+    def HasEntry(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasEntry,(self,) + _args, _kwargs)
+        return val
+    def HasGroup(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_HasGroup,(self,) + _args, _kwargs)
+        return val
+    def IsExpandingEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsExpandingEnvVars,(self,) + _args, _kwargs)
+        return val
+    def IsRecordingDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_IsRecordingDefaults,(self,) + _args, _kwargs)
+        return val
+    def Read(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Read,(self,) + _args, _kwargs)
+        return val
+    def ReadInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadInt,(self,) + _args, _kwargs)
+        return val
+    def ReadFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_ReadFloat,(self,) + _args, _kwargs)
+        return val
+    def SetExpandEnvVars(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetExpandEnvVars,(self,) + _args, _kwargs)
+        return val
+    def SetPath(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetPath,(self,) + _args, _kwargs)
+        return val
+    def SetRecordDefaults(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_SetRecordDefaults,(self,) + _args, _kwargs)
+        return val
+    def Write(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_Write,(self,) + _args, _kwargs)
+        return val
+    def WriteInt(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteInt,(self,) + _args, _kwargs)
+        return val
+    def WriteFloat(self, *_args, **_kwargs):
+        val = apply(utilsc.wxConfig_WriteFloat,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxConfig instance at %s>" % (self.this,)
+class wxConfig(wxConfigPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(utilsc.new_wxConfig,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+
+
+#-------------- FUNCTION WRAPPERS ------------------
+
+
+
+#-------------- VARIABLE WRAPPERS ------------------
+

wxPython/src/gtk/wx.cpp

@@ -636,6 +636,9 @@ extern "C" SWIGEXPORT(void) initprintfwc();
 extern "C" SWIGEXPORT(void) initsizersc();
 extern "C" SWIGEXPORT(void) initclip_dndc();
 extern "C" SWIGEXPORT(void) initgridc();
+extern "C" SWIGEXPORT(void) initutilsc();
+extern "C" SWIGEXPORT(void) inithtmlc();
+extern "C" SWIGEXPORT(void) inithtmlhelpc();
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1644,6 +1647,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
     { "_wxBMPHandler","_class_wxBMPHandler",0},
     { "_wxImage","_class_wxImage",0},
+    { "_wxFlexGridSizer","_class_wxFlexGridSizer",0},
     { "_wxPrintQuality","_wxCoord",0},
     { "_wxPrintQuality","_int",0},
     { "_wxPrintQuality","_signed_int",0},
@@ -1700,6 +1704,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxSizer","_wxSizer",0},
     { "_class_wxTIFFHandler","_wxTIFFHandler",0},
     { "_class_wxPrintDialogData","_wxPrintDialogData",0},
+    { "_wxGridSizer","_class_wxGridSizer",0},
     { "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
     { "_class_wxClipboard","_wxClipboard",0},
     { "_class_wxGauge","_wxGauge",0},
@@ -1712,6 +1717,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxProgressDialog","_class_wxProgressDialog",0},
     { "_class_wxBMPHandler","_wxBMPHandler",0},
     { "_wxPrintPreview","_class_wxPrintPreview",0},
+    { "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
     { "_wxSpinEvent","_class_wxSpinEvent",0},
     { "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
     { "_size_t","_wxCoord",0},
@@ -1869,6 +1875,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCaret","_wxCaret",0},
     { "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
     { "_class_wxBrush","_wxBrush",0},
+    { "_wxTipProvider","_class_wxTipProvider",0},
     { "_unsigned_short","_WXTYPE",0},
     { "_unsigned_short","_short",0},
     { "_class_wxWindow","_wxWindow",0},
@@ -1939,8 +1946,10 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
     { "_class_wxImageList","_wxImageList",0},
     { "_class_wxBitmapButton","_wxBitmapButton",0},
+    { "_wxPyTipProvider","_class_wxPyTipProvider",0},
     { "_wxFrame","_class_wxFrame",0},
     { "_wxPCXHandler","_class_wxPCXHandler",0},
+    { "_class_wxGridSizer","_wxGridSizer",0},
     { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
     { "_class_wxNotebook","_wxNotebook",0},
     { "_wxJPEGHandler","_class_wxJPEGHandler",0},
@@ -2008,6 +2017,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxEraseEvent","_class_wxEraseEvent",0},
     { "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
     { "_class_wxJoystickEvent","_wxJoystickEvent",0},
+    { "_class_wxTipProvider","_wxTipProvider",0},
     { "_class_wxMiniFrame","_wxMiniFrame",0},
     { "_wxFontDialog","_class_wxFontDialog",0},
     { "_wxRegion","_class_wxRegion",0},
@@ -2015,6 +2025,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
     { "_wxSizer","_class_wxSizer",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_class_wxPyTipProvider","_wxPyTipProvider",0},
     { "_class_wxPCXHandler","_wxPCXHandler",0},
     { "_wxTIFFHandler","_class_wxTIFFHandler",0},
     { "_wxPyDropTarget","_class_wxPyDropTarget",0},
@@ -2753,7 +2764,7 @@ SWIGEXPORT(void) initwxc() {
 
 
         // Since these modules are all linked together, initialize them now
-        // because python won't be able to find their shared library files,
+        // because Python won't be able to find their shared library files,
         // (since there isn't any.)
     initwindowsc();
     initwindows2c();
@@ -2772,7 +2783,12 @@ SWIGEXPORT(void) initwxc() {
     initprintfwc();
     initsizersc();
     initclip_dndc();
+
     initgridc();
+    initutilsc();
+    inithtmlc();
+    inithtmlhelpc();
+
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)

wxPython/src/gtk/wx.py

@@ -1388,33 +1388,33 @@ def EVT_TASKBAR_RIGHT_DCLICK(win, func):
     win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
 
 
-# wxGrid
+## # wxGrid  *** THE OLD ONE ***
-def EVT_GRID_SELECT_CELL(win, fn):
+## def EVT_GRID_SELECT_CELL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn)
 
-def EVT_GRID_CREATE_CELL(win, fn):
+## def EVT_GRID_CREATE_CELL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn)
 
-def EVT_GRID_CHANGE_LABELS(win, fn):
+## def EVT_GRID_CHANGE_LABELS(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn)
 
-def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
+## def EVT_GRID_CHANGE_SEL_LABEL(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn)
 
-def EVT_GRID_CELL_CHANGE(win, fn):
+## def EVT_GRID_CELL_CHANGE(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn)
 
-def EVT_GRID_CELL_LCLICK(win, fn):
+## def EVT_GRID_CELL_LCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn)
 
-def EVT_GRID_CELL_RCLICK(win, fn):
+## def EVT_GRID_CELL_RCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn)
 
-def EVT_GRID_LABEL_LCLICK(win, fn):
+## def EVT_GRID_LABEL_LCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn)
 
-def EVT_GRID_LABEL_RCLICK(win, fn):
+## def EVT_GRID_LABEL_RCLICK(win, fn):
-    win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
+##     win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn)
 
 
 # wxSashWindow
@@ -1662,6 +1662,20 @@ class wxPySimpleApp(wxApp):
         return true
 
 
+class wxPyWidgetTester(wxApp):
+    def __init__(self, size = (250, 100)):
+        self.size = size
+        wxApp.__init__(self, 0)
+
+    def OnInit(self):
+        self.frame = wxFrame(None, -1, "Widget Tester", pos=(0,0), size=self.size)
+        self.SetTopWindow(self.frame)
+        return true
+
+    def SetWidget(self, widgetClass, *args):
+        w = apply(widgetClass, (self.frame,) + args)
+        self.frame.Show(true)
+
 #----------------------------------------------------------------------------
 # DO NOT hold any other references to this object.  This is how we know when
 # to cleanup system resources that wxWin is holding.  When this module is