Added wxPython support of new HTML Printing classes.

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

utils/wxPython/modules/html/html.i

@@ -16,10 +16,13 @@
 %{
 #include "helpers.h"
 #include <wx/html/htmlwin.h>
+#include <wx/html/htmprint.h>
 #include <wx/image.h>
 #include <wx/fs_zip.h>
 #include <wx/fs_inet.h>
 #include <wx/wfstream.h>
+
+#include "printfw.h"
 %}
 
 //---------------------------------------------------------------------------
@@ -33,6 +36,7 @@
 %extern events.i
 %extern controls.i
 %extern controls2.i
+%extern printfw.i
 
 %extern utils.i
 
@@ -200,6 +204,8 @@ public:
     // wxObject* GetProduct();
     void AddTagHandler(wxHtmlTagHandler *handler);
     wxString* GetSource();
+    void PushTagHandler(wxHtmlTagHandler* handler, wxString tags);
+    void PopTagHandler();
 
 
     // void AddText(const char* txt) = 0;
@@ -223,7 +229,9 @@ public:
 
     wxHtmlContainerCell* GetContainer();
     wxHtmlContainerCell* OpenContainer();
+    wxHtmlContainerCell *SetContainer(wxHtmlContainerCell *c);
     wxHtmlContainerCell* CloseContainer();
+
     int GetFontSize();
     void SetFontSize(int s);
     int GetFontBold();
@@ -332,7 +340,7 @@ public:
     void OnExit() {
         Py_DECREF(m_tagHandlerClass);
         m_tagHandlerClass = NULL;
-        for (int x=0; x < m_objArray.GetCount(); x++) {
+        for (size_t x=0; x < m_objArray.GetCount(); x++) {
             PyObject* obj = (PyObject*)m_objArray.Item(x);
             Py_DECREF(obj);
         }
@@ -377,6 +385,7 @@ private:
     }
 %}
 
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
@@ -400,6 +409,9 @@ public:
     void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
     void DrawInvisible(wxDC& dc, int x, int y);
     const wxHtmlCell* Find(int condition, const void* param);
+
+    bool AdjustPagebreak(int * pagebreak);
+    void SetCanLiveOnPagebreak(bool can);
 };
 
 
@@ -517,6 +529,73 @@ public:
 %}
 
 
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
+
+class wxHtmlDCRenderer {
+public:
+    wxHtmlDCRenderer();
+    ~wxHtmlDCRenderer();
+
+    void SetDC(wxDC *dc, int maxwidth);
+    void SetSize(int width, int height);
+    void SetHtmlText(const wxString& html,
+                     const wxString& basepath = wxEmptyString,
+                     bool isdir = TRUE);
+    int Render(int x, int y, int from = 0, int dont_render = FALSE);
+    int GetTotalHeight();
+                // returns total height of the html document
+                // (compare Render's return value with this)
+};
+
+enum {
+    wxPAGE_ODD,
+    wxPAGE_EVEN,
+    wxPAGE_ALL
+};
+
+
+class wxHtmlPrintout : public wxPyPrintout {
+public:
+    wxHtmlPrintout(const wxString& title = "Printout");
+    ~wxHtmlPrintout();
+
+    void SetHtmlText(const wxString& html,
+                     const wxString &basepath = wxEmptyString,
+                     bool isdir = TRUE);
+    void SetHtmlFile(const wxString &htmlfile);
+    void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
+    void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
+    void SetMargins(float top = 25.2, float bottom = 25.2,
+                    float left = 25.2, float right = 25.2,
+                    float spaces = 5);
+};
+
+
+
+class wxHtmlEasyPrinting {
+public:
+    wxHtmlEasyPrinting(const wxString& name = "Printing",
+                       wxFrame *parent_frame = NULL);
+    ~wxHtmlEasyPrinting();
+
+    void PreviewFile(const wxString &htmlfile);
+    void PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
+    void PrintFile(const wxString &htmlfile);
+    void PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
+    void PrinterSetup();
+    void PageSetup();
+    void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
+    void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
+
+    wxPrintData *GetPrintData() {return m_PrintData;}
+    wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
+
+};
+
+
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 

utils/wxPython/modules/html/html.py

@@ -102,6 +102,12 @@ class wxHtmlParserPtr :
     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):
@@ -143,6 +149,10 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
         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) 
@@ -328,6 +338,12 @@ class wxHtmlCellPtr :
         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):
@@ -515,6 +531,119 @@ class wxHtmlWindow(wxHtmlWindowPtr):
 
 
 
+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 ------------------
@@ -546,6 +675,9 @@ 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 -----------------------

utils/wxPython/modules/html/htmlhelp.cpp

@@ -1,5 +1,5 @@
 /*
- * FILE : htmlhelp.cpp
+ * FILE : ./htmlhelp.cpp
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
@@ -469,132 +469,6 @@ static PyObject *_wrap_wxHtmlHelpFrameCfg_navig_on_get(PyObject *self, PyObject
     return _resultobj;
 }
 
-#define wxHtmlHelpFrameCfg_style_set(_swigobj,_swigval) (_swigobj->style = _swigval,_swigval)
-static PyObject *_wrap_wxHtmlHelpFrameCfg_style_set(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxHtmlHelpFrameCfg * _arg0;
-    int  _arg1;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self","style", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlHelpFrameCfg_style_set",_kwnames,&_argo0,&_arg1)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlHelpFrameCfg_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlHelpFrameCfg_style_set. Expected _wxHtmlHelpFrameCfg_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (int )wxHtmlHelpFrameCfg_style_set(_arg0,_arg1);
-
-    wxPy_END_ALLOW_THREADS;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxHtmlHelpFrameCfg_style_get(_swigobj) ((int ) _swigobj->style)
-static PyObject *_wrap_wxHtmlHelpFrameCfg_style_get(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    int  _result;
-    wxHtmlHelpFrameCfg * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlHelpFrameCfg_style_get",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlHelpFrameCfg_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlHelpFrameCfg_style_get. Expected _wxHtmlHelpFrameCfg_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (int )wxHtmlHelpFrameCfg_style_get(_arg0);
-
-    wxPy_END_ALLOW_THREADS;
-}    _resultobj = Py_BuildValue("i",_result);
-    return _resultobj;
-}
-
-#define wxHtmlHelpFrameCfg_titleformat_set(_swigobj,_swigval) (_swigobj->titleformat = *(_swigval),_swigval)
-static PyObject *_wrap_wxHtmlHelpFrameCfg_titleformat_set(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxHtmlHelpFrameCfg * _arg0;
-    wxString * _arg1;
-    PyObject * _argo0 = 0;
-    PyObject * _obj1 = 0;
-    char *_kwnames[] = { "self","titleformat", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlHelpFrameCfg_titleformat_set",_kwnames,&_argo0,&_obj1)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlHelpFrameCfg_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlHelpFrameCfg_titleformat_set. Expected _wxHtmlHelpFrameCfg_p.");
-        return NULL;
-        }
-    }
-{
-    if (!PyString_Check(_obj1)) {
-        PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
-        return NULL;
-    }
-    _arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
-}
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxString *)wxHtmlHelpFrameCfg_titleformat_set(_arg0,_arg1);
-
-    wxPy_END_ALLOW_THREADS;
-}{
-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
-}
-{
-    if (_obj1)
-        delete _arg1;
-}
-    return _resultobj;
-}
-
-#define wxHtmlHelpFrameCfg_titleformat_get(_swigobj) (&_swigobj->titleformat)
-static PyObject *_wrap_wxHtmlHelpFrameCfg_titleformat_get(PyObject *self, PyObject *args, PyObject *kwargs) {
-    PyObject * _resultobj;
-    wxString * _result;
-    wxHtmlHelpFrameCfg * _arg0;
-    PyObject * _argo0 = 0;
-    char *_kwnames[] = { "self", NULL };
-
-    self = self;
-    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlHelpFrameCfg_titleformat_get",_kwnames,&_argo0)) 
-        return NULL;
-    if (_argo0) {
-        if (_argo0 == Py_None) { _arg0 = NULL; }
-        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlHelpFrameCfg_p")) {
-            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlHelpFrameCfg_titleformat_get. Expected _wxHtmlHelpFrameCfg_p.");
-        return NULL;
-        }
-    }
-{
-    wxPy_BEGIN_ALLOW_THREADS;
-        _result = (wxString *)wxHtmlHelpFrameCfg_titleformat_get(_arg0);
-
-    wxPy_END_ALLOW_THREADS;
-}{
-    _resultobj = PyString_FromString(WXSTRINGCAST (*_result));
-}
-    return _resultobj;
-}
-
 #define new_wxHtmlBookRecord(_swigarg0,_swigarg1,_swigarg2) (new wxHtmlBookRecord(_swigarg0,_swigarg1,_swigarg2))
 static PyObject *_wrap_new_wxHtmlBookRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
@@ -2980,10 +2854,6 @@ static PyMethodDef htmlhelpcMethods[] = {
 	 { "wxHtmlBookRecord_GetStart", (PyCFunction) _wrap_wxHtmlBookRecord_GetStart, METH_VARARGS | METH_KEYWORDS },
 	 { "wxHtmlBookRecord_GetTitle", (PyCFunction) _wrap_wxHtmlBookRecord_GetTitle, METH_VARARGS | METH_KEYWORDS },
 	 { "new_wxHtmlBookRecord", (PyCFunction) _wrap_new_wxHtmlBookRecord, METH_VARARGS | METH_KEYWORDS },
-	 { "wxHtmlHelpFrameCfg_titleformat_get", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_titleformat_get, METH_VARARGS | METH_KEYWORDS },
-	 { "wxHtmlHelpFrameCfg_titleformat_set", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_titleformat_set, METH_VARARGS | METH_KEYWORDS },
-	 { "wxHtmlHelpFrameCfg_style_get", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_style_get, METH_VARARGS | METH_KEYWORDS },
-	 { "wxHtmlHelpFrameCfg_style_set", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_style_set, METH_VARARGS | METH_KEYWORDS },
 	 { "wxHtmlHelpFrameCfg_navig_on_get", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_navig_on_get, METH_VARARGS | METH_KEYWORDS },
 	 { "wxHtmlHelpFrameCfg_navig_on_set", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_navig_on_set, METH_VARARGS | METH_KEYWORDS },
 	 { "wxHtmlHelpFrameCfg_sashpos_get", (PyCFunction) _wrap_wxHtmlHelpFrameCfg_sashpos_get, METH_VARARGS | METH_KEYWORDS },
@@ -3088,6 +2958,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_size_t","_wxWindowID",0},
     { "_size_t","_uint",0},
     { "_class_wxRealPoint","_wxRealPoint",0},
+    { "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
+    { "_wxPNMHandler","_class_wxPNMHandler",0},
+    { "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
     { "_class_wxMenuItem","_wxMenuItem",0},
     { "_class_wxPaintEvent","_wxPaintEvent",0},
     { "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
@@ -3107,6 +2980,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPNGHandler","_wxPNGHandler",0},
     { "_wxColour","_class_wxColour",0},
     { "_class_wxDialog","_wxDialog",0},
+    { "_wxBusyCursor","_class_wxBusyCursor",0},
     { "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
     { "_class_wxPrinter","_wxPrinter",0},
     { "_wxIdleEvent","_class_wxIdleEvent",0},
@@ -3140,6 +3014,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxButton","_wxButton",0},
     { "_wxRadioBox","_class_wxRadioBox",0},
     { "_class_wxFontData","_wxFontData",0},
+    { "_class_wxPNMHandler","_wxPNMHandler",0},
     { "_wxBoxSizer","_class_wxBoxSizer",0},
     { "_class___wxPyCleanup","___wxPyCleanup",0},
     { "_wxHtmlCell","_class_wxHtmlCell",0},
@@ -3163,6 +3038,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxConfig","_class_wxConfig",0},
     { "_class_wxIconizeEvent","_wxIconizeEvent",0},
     { "_class_wxStaticBitmap","_wxStaticBitmap",0},
+    { "_class_wxBusyCursor","_wxBusyCursor",0},
     { "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
     { "_wxListItem","_class_wxListItem",0},
     { "_class_wxToolBar","_wxToolBar",0},
@@ -3176,6 +3052,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_EBool","_wxWindowID",0},
     { "_class_wxRegion","_wxRegion",0},
     { "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
+    { "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
     { "_class_wxPreviewFrame","_wxPreviewFrame",0},
     { "_wxHtmlContainerCell","_class_wxHtmlContainerCell",0},
     { "_wxStaticText","_class_wxStaticText",0},
@@ -3189,9 +3066,11 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxDC","_wxDC",0},
     { "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
     { "_class_wxProgressDialog","_wxProgressDialog",0},
+    { "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
     { "_wxPyApp","_class_wxPyApp",0},
     { "_wxHtmlWinParser","_class_wxHtmlWinParser",0},
     { "_wxHtmlSearchStatus","_class_wxHtmlSearchStatus",0},
+    { "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
     { "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
     { "_class_wxTreeEvent","_wxTreeEvent",0},
     { "_class_wxDirDialog","_wxDirDialog",0},
@@ -3240,7 +3119,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxPyValidator","_wxPyValidator",0},
     { "_class_wxCloseEvent","_wxCloseEvent",0},
     { "_wxSashEvent","_class_wxSashEvent",0},
+    { "_wxBusyInfo","_class_wxBusyInfo",0},
     { "_class_wxMenuEvent","_wxMenuEvent",0},
+    { "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
     { "_wxClientDC","_class_wxClientDC",0},
     { "_wxMouseEvent","_class_wxMouseEvent",0},
     { "_wxListCtrl","_class_wxListCtrl",0},
@@ -3305,6 +3186,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxFrame","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxFrame},
     { "_wxFrame","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxFrame},
     { "_wxFrame","_class_wxFrame",0},
+    { "_wxPCXHandler","_class_wxPCXHandler",0},
+    { "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
     { "_class_wxNotebook","_wxNotebook",0},
     { "_wxJPEGHandler","_class_wxJPEGHandler",0},
     { "_wxWindowID","_wxPrintQuality",0},
@@ -3328,7 +3211,9 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_class_wxListEvent","_wxListEvent",0},
     { "_class_wxPrintPreview","_wxPrintPreview",0},
     { "_class_wxSpinEvent","_wxSpinEvent",0},
+    { "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
     { "_wxPyHtmlWinTagHandler","_class_wxPyHtmlWinTagHandler",0},
+    { "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
     { "_wxButton","_class_wxButton",0},
     { "_class_wxPyApp","_wxPyApp",0},
     { "_wxSize","_class_wxSize",0},
@@ -3364,10 +3249,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxPreviewFrame","_class_wxPreviewFrame",0},
     { "_wxSizer","_class_wxSizer",0},
     { "_class_wxShowEvent","_wxShowEvent",0},
+    { "_class_wxPCXHandler","_wxPCXHandler",0},
     { "_wxActivateEvent","_class_wxActivateEvent",0},
     { "_wxGauge","_class_wxGauge",0},
     { "_class_wxCheckListBox","_wxCheckListBox",0},
     { "_wxHtmlParser","_class_wxHtmlParser",0},
+    { "_class_wxBusyInfo","_wxBusyInfo",0},
     { "_class_wxGridEvent","_wxGridEvent",0},
     { "_class_wxCommandEvent","_wxCommandEvent",0},
     { "_class_wxClientDC","_wxClientDC",0},
@@ -3409,6 +3296,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
     { "_wxWindow","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxWindow},
     { "_wxWindow","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxWindow},
     { "_wxWindow","_class_wxWindow",0},
+    { "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
     { "_class_wxFrame","_class_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxFrame},
     { "_class_wxFrame","_wxHtmlHelpFrame",SwigwxHtmlHelpFrameTowxFrame},
     { "_class_wxFrame","_wxFrame",0},
@@ -3434,6 +3322,8 @@ SWIGEXPORT(void) inithtmlhelpc() {
 	 PyDict_SetItemString(d,"wxID_HTML_SEARCHTEXT", PyInt_FromLong((long) wxID_HTML_SEARCHTEXT));
 	 PyDict_SetItemString(d,"wxID_HTML_SEARCHLIST", PyInt_FromLong((long) wxID_HTML_SEARCHLIST));
 	 PyDict_SetItemString(d,"wxID_HTML_SEARCHBUTTON", PyInt_FromLong((long) wxID_HTML_SEARCHBUTTON));
+	 PyDict_SetItemString(d,"wxID_HTML_SEARCHCHOICE", PyInt_FromLong((long) wxID_HTML_SEARCHCHOICE));
+	 PyDict_SetItemString(d,"wxID_HTML_HELPFRAME", PyInt_FromLong((long) wxID_HTML_HELPFRAME));
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)

utils/wxPython/modules/html/htmlhelp.i

@@ -53,7 +53,10 @@ enum {
     wxID_HTML_SEARCHPAGE,
     wxID_HTML_SEARCHTEXT,
     wxID_HTML_SEARCHLIST,
-    wxID_HTML_SEARCHBUTTON
+    wxID_HTML_SEARCHBUTTON,
+    wxID_HTML_SEARCHCHOICE,
+    wxID_HTML_HELPFRAME
+
 };
 
 //---------------------------------------------------------------------------
@@ -66,8 +69,6 @@ public:
     long x, y, w, h;
     long sashpos;
     bool navig_on;
-    int style;
-    wxString titleformat;
 };
 
 

utils/wxPython/modules/html/htmlhelp.py

@@ -55,12 +55,6 @@ class wxHtmlHelpFrameCfgPtr :
         if name == "navig_on" :
             htmlhelpc.wxHtmlHelpFrameCfg_navig_on_set(self,value)
             return
-        if name == "style" :
-            htmlhelpc.wxHtmlHelpFrameCfg_style_set(self,value)
-            return
-        if name == "titleformat" :
-            htmlhelpc.wxHtmlHelpFrameCfg_titleformat_set(self,value)
-            return
         self.__dict__[name] = value
     def __getattr__(self,name):
         if name == "x" : 
@@ -75,10 +69,6 @@ class wxHtmlHelpFrameCfgPtr :
             return htmlhelpc.wxHtmlHelpFrameCfg_sashpos_get(self)
         if name == "navig_on" : 
             return htmlhelpc.wxHtmlHelpFrameCfg_navig_on_get(self)
-        if name == "style" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_style_get(self)
-        if name == "titleformat" : 
-            return htmlhelpc.wxHtmlHelpFrameCfg_titleformat_get(self)
         raise AttributeError,name
     def __repr__(self):
         return "<C wxHtmlHelpFrameCfg instance at %s>" % (self.this,)
@@ -378,3 +368,5 @@ 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