From: Robin Dunn Date: Fri, 18 Jul 2003 02:26:53 +0000 (+0000) Subject: Minimal changes needed to build/run wxPython on the 2.5 branch after X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dd116e73f0ad388e169676ec79cf176699956e7d?hp=fd657b8a5907c8584db84c85535ce281bdd65193 Minimal changes needed to build/run wxPython on the 2.5 branch after the merge. Still need to look for and apply most changes and new additions that have happened since the last merge. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/setup.py b/wxPython/setup.py index dc52ba0d25..93d8c255ae 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -748,7 +748,7 @@ if BUILD_OGL: '%s/composit.cpp' % OGLLOC, '%s/divided.cpp' % OGLLOC, '%s/lines.cpp' % OGLLOC, - '%s/misc.cpp' % OGLLOC, + '%s/oglmisc.cpp' % OGLLOC, '%s/basic2.cpp' % OGLLOC, '%s/canvas.cpp' % OGLLOC, '%s/constrnt.cpp' % OGLLOC, @@ -758,7 +758,7 @@ if BUILD_OGL: ] + swig_sources, include_dirs = [OGLINC] + includes, - define_macros = defines, + define_macros = defines + [('wxUSE_DEPRECATED', '0')], library_dirs = libdirs, libraries = libs, diff --git a/wxPython/src/_extras.py b/wxPython/src/_extras.py index 1cc71d3a8b..ce9dcdb12e 100644 --- a/wxPython/src/_extras.py +++ b/wxPython/src/_extras.py @@ -970,6 +970,15 @@ of your Mac.""" if redirect: self.RedirectStdio(filename) + # Set the default handler for SIGINT. This fixes a problem + # where if Ctrl-C is pressed in the console that started this + # app then it will not appear to do anything, (not even send + # KeyboardInterrupt???) but will later segfault on exit. By + # setting the default handler then the app will exit, as + # expected (depending on platform.) + import signal + signal.signal(signal.SIGINT, signal.SIG_DFL) + # this initializes wxWindows and then calls our OnInit _wxStart(self.OnInit) diff --git a/wxPython/src/clip_dnd.i b/wxPython/src/clip_dnd.i index 2efd633649..d61d0227c8 100644 --- a/wxPython/src/clip_dnd.i +++ b/wxPython/src/clip_dnd.i @@ -418,12 +418,10 @@ public: void UsePrimarySelection( int primary = FALSE ); }; -%{ - // See below in the init function... - wxClipboard* wxPyTheClipboard; -%} + %readonly -%name(wxTheClipboard) wxClipboard* wxPyTheClipboard; +// See also wxPy_ReinitStockObjects in helpers.cpp +extern wxClipboard* wxTheClipboard; %readwrite //---------------------------------------------------------------------- @@ -674,7 +672,6 @@ public: %init %{ - wxPyTheClipboard = wxTheClipboard; wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource"); wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget"); wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget"); diff --git a/wxPython/src/controls.i b/wxPython/src/controls.i index f6146b9e27..57fdacdc1e 100644 --- a/wxPython/src/controls.i +++ b/wxPython/src/controls.i @@ -49,6 +49,7 @@ //---------------------------------------------------------------------- %readonly +// See also wxPy_ReinitStockObjects in helpers.cpp wxValidator wxDefaultValidator; %readwrite diff --git a/wxPython/src/filesys.i b/wxPython/src/filesys.i index 69d782e325..2367cb82ce 100644 --- a/wxPython/src/filesys.i +++ b/wxPython/src/filesys.i @@ -141,13 +141,23 @@ public: static void AddHandler(wxFileSystemHandler *handler); static void CleanUpHandlers(); -// // Returns the native path for a file URL -// static wxFileName URLToFileName(const wxString& url); + // Returns the file URL for a native path + static wxString FileNameToURL(const wxString& filename); -// // Returns the file URL for a native path -// static wxString FileNameToURL(const wxFileName& filename); + // Returns the native path for a file URL + //static wxFileName URLToFileName(const wxString& url); *** See below }; + +// Returns the native path for a file URL +wxString wxFileSystem_URLToFileName(const wxString& url); +%{ + wxString wxFileSystem_URLToFileName(const wxString& url) { + wxFileName fname = wxFileSystem::URLToFileName(url); + return fname.GetFullPath(); + } +%} + //--------------------------------------------------------------------------- class wxInternetFSHandler : public wxFileSystemHandler { diff --git a/wxPython/src/gdi.i b/wxPython/src/gdi.i index 6905b8133e..a7fe51ad66 100644 --- a/wxPython/src/gdi.i +++ b/wxPython/src/gdi.i @@ -432,31 +432,20 @@ public: class wxColourDatabase : public wxObject { public: - wxColour *FindColour(const wxString& colour); + wxColour *FindColour(const wxString& colour) ; + wxColour *FindColourNoAdd(const wxString& colour) const; wxString FindName(const wxColour& colour) const; %addmethods { - void Append(const wxString& name, int red, int green, int blue) { - // first see if the name is already there - wxString cName = name; - cName.MakeUpper(); - wxString cName2 = cName; - if ( !cName2.Replace(wxT("GRAY"), wxT("GREY")) ) - cName2.clear(); - - wxNode *node = self->GetFirst(); - while ( node ) { - const wxChar *key = node->GetKeyString(); - if ( cName == key || cName2 == key ) { - wxColour* c = (wxColour *)node->GetData(); - c->Set(red, green, blue); - return; - } - node = node->GetNext(); - } + void AddColour(const wxString& name, wxColour* colour) { + // make a copy since the python one will be GC'd + wxColour* c = new wxColour(*colour); + self->AddColour(name, c); + } - // otherwise append the new colour - self->Append(name.c_str(), new wxColour(red, green, blue)); + void Append(const wxString& name, int red, int green, int blue) { + wxColour* c = new wxColour(red, green, blue); + self->AddColour(name, c); } } }; @@ -1164,6 +1153,8 @@ public: #if 0 %} +// See also wxPy_ReinitStockObjects in helpers.cpp + extern wxFont *wxNORMAL_FONT; extern wxFont *wxSMALL_FONT; extern wxFont *wxITALIC_FONT; diff --git a/wxPython/src/gtk/clip_dnd.cpp b/wxPython/src/gtk/clip_dnd.cpp index 8507ff745f..50ccd63b9c 100644 --- a/wxPython/src/gtk/clip_dnd.cpp +++ b/wxPython/src/gtk/clip_dnd.cpp @@ -196,9 +196,7 @@ void wxPyBitmapDataObject::SetBitmap(const wxBitmap& bitmap) { } wxPyEndBlockThreads(); } - - // See below in the init function... - wxClipboard* wxPyTheClipboard; +extern wxClipboard * wxTheClipboard; class wxPyDropSource : public wxDropSource { public: @@ -364,17 +362,17 @@ static PyObject *_wrap_wxPyFormatInvalid_get() { return pyobj; } -static int _wrap_wxPyTheClipboard_set(PyObject *val) { +static int _wrap_wxTheClipboard_set(PyObject *val) { PyErr_SetString(PyExc_TypeError,"Variable wxTheClipboard is read-only."); return 1; } -static PyObject *_wrap_wxPyTheClipboard_get() { +static PyObject *_wrap_wxTheClipboard_get() { PyObject * pyobj; char ptemp[128]; - SWIG_MakePtr(ptemp, (char *) wxPyTheClipboard,"_wxClipboard_p"); + SWIG_MakePtr(ptemp, (char *) wxTheClipboard,"_wxClipboard_p"); pyobj = PyString_FromString(ptemp); return pyobj; } @@ -3679,7 +3677,7 @@ SWIGEXPORT(void) initclip_dndc() { PyDict_SetItemString(d,"wxDF_MAX", PyInt_FromLong((long) wxDF_MAX)); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxFormatInvalid",_wrap_wxPyFormatInvalid_get, _wrap_wxPyFormatInvalid_set); - SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxPyTheClipboard_get, _wrap_wxPyTheClipboard_set); + SWIG_addvarlink(SWIG_globals,"wxTheClipboard",_wrap_wxTheClipboard_get, _wrap_wxTheClipboard_set); PyDict_SetItemString(d,"wxDrag_CopyOnly", PyInt_FromLong((long) wxDrag_CopyOnly)); PyDict_SetItemString(d,"wxDrag_AllowMove", PyInt_FromLong((long) wxDrag_AllowMove)); PyDict_SetItemString(d,"wxDrag_DefaultMove", PyInt_FromLong((long) wxDrag_DefaultMove)); @@ -3691,7 +3689,6 @@ SWIGEXPORT(void) initclip_dndc() { PyDict_SetItemString(d,"wxDragCancel", PyInt_FromLong((long) wxDragCancel)); - wxPyTheClipboard = wxTheClipboard; wxPyPtrTypeMap_Add("wxDropSource", "wxPyDropSource"); wxPyPtrTypeMap_Add("wxTextDropTarget", "wxPyTextDropTarget"); wxPyPtrTypeMap_Add("wxFileDropTarget", "wxPyFileDropTarget"); diff --git a/wxPython/src/gtk/filesys.cpp b/wxPython/src/gtk/filesys.cpp index 2471de188f..26aec7ceca 100644 --- a/wxPython/src/gtk/filesys.cpp +++ b/wxPython/src/gtk/filesys.cpp @@ -128,6 +128,11 @@ IMP_PYCALLBACK_FSF_FSSTRING_pure(wxPyFileSystemHandler, wxFileSystemHandler, Ope IMP_PYCALLBACK_STRING_STRINGINT_pure(wxPyFileSystemHandler, wxFileSystemHandler, FindFirst); IMP_PYCALLBACK_STRING__pure(wxPyFileSystemHandler, wxFileSystemHandler, FindNext); + wxString wxFileSystem_URLToFileName(const wxString& url) { + wxFileName fname = wxFileSystem::URLToFileName(url); + return fname.GetFullPath(); + } + void __wxMemoryFSHandler_AddFile_wxImage(const wxString& filename, wxImage& image, long type) { @@ -151,6 +156,44 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename, #ifdef __cplusplus extern "C" { #endif +static PyObject *_wrap_wxFileSystem_URLToFileName(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "url", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_URLToFileName",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxFileSystem_URLToFileName(*_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + if (_obj0) + delete _arg0; +} +{ + delete _result; +} + return _resultobj; +} + static PyObject *_wrap___wxMemoryFSHandler_AddFile_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxString * _arg0; @@ -1311,6 +1354,44 @@ static PyObject *_wrap_wxFileSystem_CleanUpHandlers(PyObject *self, PyObject *ar return _resultobj; } +static PyObject *_wrap_wxFileSystem_FileNameToURL(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxString * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char *_kwnames[] = { "filename", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileSystem_FileNameToURL",_kwnames,&_obj0)) + return NULL; +{ + _arg0 = wxString_in_helper(_obj0); + if (_arg0 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxString (wxFileSystem::FileNameToURL(*_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ +#if wxUSE_UNICODE + _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len()); +#else + _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len()); +#endif +} +{ + if (_obj0) + delete _arg0; +} +{ + delete _result; +} + return _resultobj; +} + static void *SwigwxInternetFSHandlerTowxFileSystemHandler(void *ptr) { wxInternetFSHandler *src; wxFileSystemHandler *dest; @@ -1911,6 +1992,7 @@ static PyMethodDef filesyscMethods[] = { { "wxInternetFSHandler_OpenFile", (PyCFunction) _wrap_wxInternetFSHandler_OpenFile, METH_VARARGS | METH_KEYWORDS }, { "wxInternetFSHandler_CanOpen", (PyCFunction) _wrap_wxInternetFSHandler_CanOpen, METH_VARARGS | METH_KEYWORDS }, { "new_wxInternetFSHandler", (PyCFunction) _wrap_new_wxInternetFSHandler, METH_VARARGS | METH_KEYWORDS }, + { "wxFileSystem_FileNameToURL", (PyCFunction) _wrap_wxFileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_CleanUpHandlers", (PyCFunction) _wrap_wxFileSystem_CleanUpHandlers, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_AddHandler", (PyCFunction) _wrap_wxFileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS }, { "wxFileSystem_FindNext", (PyCFunction) _wrap_wxFileSystem_FindNext, METH_VARARGS | METH_KEYWORDS }, @@ -1939,6 +2021,7 @@ static PyMethodDef filesyscMethods[] = { { "__wxMemoryFSHandler_AddFile_Data", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_Data, METH_VARARGS | METH_KEYWORDS }, { "__wxMemoryFSHandler_AddFile_wxBitmap", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxBitmap, METH_VARARGS | METH_KEYWORDS }, { "__wxMemoryFSHandler_AddFile_wxImage", (PyCFunction) _wrap___wxMemoryFSHandler_AddFile_wxImage, METH_VARARGS | METH_KEYWORDS }, + { "wxFileSystem_URLToFileName", (PyCFunction) _wrap_wxFileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS }, { NULL, NULL } }; #ifdef __cplusplus diff --git a/wxPython/src/gtk/filesys.py b/wxPython/src/gtk/filesys.py index 9605ded1e0..27c1665beb 100644 --- a/wxPython/src/gtk/filesys.py +++ b/wxPython/src/gtk/filesys.py @@ -218,6 +218,8 @@ class wxMemoryFSHandler(wxMemoryFSHandlerPtr): #-------------- FUNCTION WRAPPERS ------------------ +wxFileSystem_URLToFileName = filesysc.wxFileSystem_URLToFileName + __wxMemoryFSHandler_AddFile_wxImage = filesysc.__wxMemoryFSHandler_AddFile_wxImage __wxMemoryFSHandler_AddFile_wxBitmap = filesysc.__wxMemoryFSHandler_AddFile_wxBitmap @@ -228,6 +230,8 @@ wxFileSystem_AddHandler = filesysc.wxFileSystem_AddHandler wxFileSystem_CleanUpHandlers = filesysc.wxFileSystem_CleanUpHandlers +wxFileSystem_FileNameToURL = filesysc.wxFileSystem_FileNameToURL + wxMemoryFSHandler_RemoveFile = filesysc.wxMemoryFSHandler_RemoveFile diff --git a/wxPython/src/gtk/gdi.cpp b/wxPython/src/gtk/gdi.cpp index 5060a2d0f0..ab027baaa3 100644 --- a/wxPython/src/gtk/gdi.cpp +++ b/wxPython/src/gtk/gdi.cpp @@ -3275,6 +3275,52 @@ static PyObject *_wrap_wxColourDatabase_FindColour(PyObject *self, PyObject *arg return _resultobj; } +#define wxColourDatabase_FindColourNoAdd(_swigobj,_swigarg0) (_swigobj->FindColourNoAdd(_swigarg0)) +static PyObject *_wrap_wxColourDatabase_FindColourNoAdd(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxColourDatabase * _arg0; + wxString * _arg1; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","colour", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxColourDatabase_FindColourNoAdd",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDatabase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDatabase_FindColourNoAdd. Expected _wxColourDatabase_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxColour *)wxColourDatabase_FindColourNoAdd(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxColourDatabase_FindName(_swigobj,_swigarg0) (_swigobj->FindName(_swigarg0)) static PyObject *_wrap_wxColourDatabase_FindName(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -3320,27 +3366,60 @@ static PyObject *_wrap_wxColourDatabase_FindName(PyObject *self, PyObject *args, return _resultobj; } -static void wxColourDatabase_Append(wxColourDatabase *self,const wxString & name,int red,int green,int blue) { - // first see if the name is already there - wxString cName = name; - cName.MakeUpper(); - wxString cName2 = cName; - if ( !cName2.Replace(wxT("GRAY"), wxT("GREY")) ) - cName2.clear(); - - wxNode *node = self->GetFirst(); - while ( node ) { - const wxChar *key = node->GetKeyString(); - if ( cName == key || cName2 == key ) { - wxColour* c = (wxColour *)node->GetData(); - c->Set(red, green, blue); - return; - } - node = node->GetNext(); - } +static void wxColourDatabase_AddColour(wxColourDatabase *self,const wxString & name,wxColour * colour) { + // make a copy since the python one will be GC'd + wxColour* c = new wxColour(*colour); + self->AddColour(name, c); + } +static PyObject *_wrap_wxColourDatabase_AddColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColourDatabase * _arg0; + wxString * _arg1; + wxColour * _arg2; + PyObject * _argo0 = 0; + PyObject * _obj1 = 0; + wxColour temp; + PyObject * _obj2 = 0; + char *_kwnames[] = { "self","name","colour", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxColourDatabase_AddColour",_kwnames,&_argo0,&_obj1,&_obj2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxColourDatabase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxColourDatabase_AddColour. Expected _wxColourDatabase_p."); + return NULL; + } + } +{ + _arg1 = wxString_in_helper(_obj1); + if (_arg1 == NULL) + return NULL; +} +{ + _arg2 = &temp; + if (! wxColour_helper(_obj2, &_arg2)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxColourDatabase_AddColour(_arg0,*_arg1,_arg2); - // otherwise append the new colour - self->Append(name.c_str(), new wxColour(red, green, blue)); + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +static void wxColourDatabase_Append(wxColourDatabase *self,const wxString & name,int red,int green,int blue) { + wxColour* c = new wxColour(red, green, blue); + self->AddColour(name, c); } static PyObject *_wrap_wxColourDatabase_Append(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -10874,7 +10953,9 @@ static PyMethodDef gdicMethods[] = { { "delete_wxPen", (PyCFunction) _wrap_delete_wxPen, METH_VARARGS | METH_KEYWORDS }, { "new_wxPen", (PyCFunction) _wrap_new_wxPen, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_Append", (PyCFunction) _wrap_wxColourDatabase_Append, METH_VARARGS | METH_KEYWORDS }, + { "wxColourDatabase_AddColour", (PyCFunction) _wrap_wxColourDatabase_AddColour, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_FindName", (PyCFunction) _wrap_wxColourDatabase_FindName, METH_VARARGS | METH_KEYWORDS }, + { "wxColourDatabase_FindColourNoAdd", (PyCFunction) _wrap_wxColourDatabase_FindColourNoAdd, METH_VARARGS | METH_KEYWORDS }, { "wxColourDatabase_FindColour", (PyCFunction) _wrap_wxColourDatabase_FindColour, METH_VARARGS | METH_KEYWORDS }, { "wxColour___ne__", (PyCFunction) _wrap_wxColour___ne__, METH_VARARGS | METH_KEYWORDS }, { "wxColour___eq__", (PyCFunction) _wrap_wxColour___eq__, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 2724b09ce0..28fad488cd 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -294,9 +294,16 @@ class wxColourDatabasePtr(wxObjectPtr): val = gdic.wxColourDatabase_FindColour(self, *_args, **_kwargs) if val: val = wxColourPtr(val) return val + def FindColourNoAdd(self, *_args, **_kwargs): + val = gdic.wxColourDatabase_FindColourNoAdd(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val def FindName(self, *_args, **_kwargs): val = gdic.wxColourDatabase_FindName(self, *_args, **_kwargs) return val + def AddColour(self, *_args, **_kwargs): + val = gdic.wxColourDatabase_AddColour(self, *_args, **_kwargs) + return val def Append(self, *_args, **_kwargs): val = gdic.wxColourDatabase_Append(self, *_args, **_kwargs) return val diff --git a/wxPython/src/gtk/html.cpp b/wxPython/src/gtk/html.cpp index f577cba551..74e8f55956 100644 --- a/wxPython/src/gtk/html.cpp +++ b/wxPython/src/gtk/html.cpp @@ -2651,6 +2651,1160 @@ static PyObject *_wrap_wxHtmlWinTagHandler_ParseInner(PyObject *self, PyObject * return _resultobj; } +#define new_wxHtmlSelection() (new wxHtmlSelection()) +static PyObject *_wrap_new_wxHtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlSelection",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlSelection *)new_wxHtmlSelection(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlSelection_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxHtmlSelection(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlSelection. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxHtmlSelection(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxHtmlSelection_Set(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + wxPoint * _arg1; + wxHtmlCell * _arg2; + wxPoint * _arg3; + wxHtmlCell * _arg4; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + PyObject * _argo2 = 0; + wxPoint temp0; + PyObject * _obj3 = 0; + PyObject * _argo4 = 0; + char *_kwnames[] = { "self","fromPos","fromCell","toPos","toCell", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOOO:wxHtmlSelection_Set",_kwnames,&_argo0,&_obj1,&_argo2,&_obj3,&_argo4)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_Set. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlSelection_Set. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + _arg3 = &temp0; + if (! wxPoint_helper(_obj3, &_arg3)) + return NULL; +} + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxHtmlSelection_Set. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_Set(_arg0,*_arg1,_arg2,*_arg3,_arg4); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_SetCells(_swigobj,_swigarg0,_swigarg1) (_swigobj->Set(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxHtmlSelection_SetCells(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + wxHtmlCell * _arg1; + wxHtmlCell * _arg2; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + PyObject * _argo2 = 0; + char *_kwnames[] = { "self","fromCell","toCell", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxHtmlSelection_SetCells",_kwnames,&_argo0,&_argo1,&_argo2)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetCells. Expected _wxHtmlSelection_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlSelection_SetCells. Expected _wxHtmlCell_p."); + return NULL; + } + } + if (_argo2) { + if (_argo2 == Py_None) { _arg2 = NULL; } + else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxHtmlCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxHtmlSelection_SetCells. Expected _wxHtmlCell_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_SetCells(_arg0,_arg1,_arg2); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_GetFromCell(_swigobj) (_swigobj->GetFromCell()) +static PyObject *_wrap_wxHtmlSelection_GetFromCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromCell",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromCell. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)wxHtmlSelection_GetFromCell(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_GetToCell(_swigobj) (_swigobj->GetToCell()) +static PyObject *_wrap_wxHtmlSelection_GetToCell(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlCell * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToCell",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToCell. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlCell *)wxHtmlSelection_GetToCell(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_GetFromPos(_swigobj) (_swigobj->GetFromPos()) +static PyObject *_wrap_wxHtmlSelection_GetFromPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromPos",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxPoint & _result_ref = wxHtmlSelection_GetFromPos(_arg0); + _result = (wxPoint *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_GetToPos(_swigobj) (_swigobj->GetToPos()) +static PyObject *_wrap_wxHtmlSelection_GetToPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToPos",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxPoint & _result_ref = wxHtmlSelection_GetToPos(_arg0); + _result = (wxPoint *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_GetFromPrivPos(_swigobj) (_swigobj->GetFromPrivPos()) +static PyObject *_wrap_wxHtmlSelection_GetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetFromPrivPos",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetFromPrivPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxPoint & _result_ref = wxHtmlSelection_GetFromPrivPos(_arg0); + _result = (wxPoint *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_GetToPrivPos(_swigobj) (_swigobj->GetToPrivPos()) +static PyObject *_wrap_wxHtmlSelection_GetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxPoint * _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_GetToPrivPos",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_GetToPrivPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxPoint & _result_ref = wxHtmlSelection_GetToPrivPos(_arg0); + _result = (wxPoint *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlSelection_SetFromPrivPos(_swigobj,_swigarg0) (_swigobj->SetFromPrivPos(_swigarg0)) +static PyObject *_wrap_wxHtmlSelection_SetFromPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + wxPoint * _arg1; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlSelection_SetFromPrivPos",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetFromPrivPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_SetFromPrivPos(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_SetToPrivPos(_swigobj,_swigarg0) (_swigobj->SetToPrivPos(_swigarg0)) +static PyObject *_wrap_wxHtmlSelection_SetToPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + wxPoint * _arg1; + PyObject * _argo0 = 0; + wxPoint temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","pos", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlSelection_SetToPrivPos",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_SetToPrivPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxPoint_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_SetToPrivPos(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_ClearPrivPos(_swigobj) (_swigobj->ClearPrivPos()) +static PyObject *_wrap_wxHtmlSelection_ClearPrivPos(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_ClearPrivPos",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_ClearPrivPos. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlSelection_ClearPrivPos(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlSelection_IsEmpty(_swigobj) (_swigobj->IsEmpty()) +static PyObject *_wrap_wxHtmlSelection_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + bool _result; + wxHtmlSelection * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlSelection_IsEmpty",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlSelection_IsEmpty. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (bool )wxHtmlSelection_IsEmpty(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define new_wxHtmlRenderingState() (new wxHtmlRenderingState()) +static PyObject *_wrap_new_wxHtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlRenderingState",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlRenderingState *)new_wxHtmlRenderingState(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingState_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxHtmlRenderingState(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlRenderingState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlRenderingState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlRenderingState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxHtmlRenderingState(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_SetSelectionState(_swigobj,_swigarg0) (_swigobj->SetSelectionState(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxHtmlSelectionState _arg1; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","s", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxHtmlRenderingState_SetSelectionState",_kwnames,&_argo0,&_arg1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetSelectionState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetSelectionState(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetSelectionState(_swigobj) (_swigobj->GetSelectionState()) +static PyObject *_wrap_wxHtmlRenderingState_GetSelectionState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelectionState _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetSelectionState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetSelectionState. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlSelectionState )wxHtmlRenderingState_GetSelectionState(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxHtmlRenderingState_SetFgColour(_swigobj,_swigarg0) (_swigobj->SetFgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","c", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingState_SetFgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetFgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetFgColour(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetFgColour(_swigobj) (_swigobj->GetFgColour()) +static PyObject *_wrap_wxHtmlRenderingState_GetFgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetFgColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetFgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxColour & _result_ref = wxHtmlRenderingState_GetFgColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingState_SetBgColour(_swigobj,_swigarg0) (_swigobj->SetBgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingState_SetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","c", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingState_SetBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_SetBgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState_SetBgColour(_arg0,*_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingState_GetBgColour(_swigobj) (_swigobj->GetBgColour()) +static PyObject *_wrap_wxHtmlRenderingState_GetBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingState * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingState_GetBgColour",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingState_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingState_GetBgColour. Expected _wxHtmlRenderingState_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + const wxColour & _result_ref = wxHtmlRenderingState_GetBgColour(_arg0); + _result = (wxColour *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingStyle_GetSelectedTextColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingStyle_GetSelectedTextColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingStyle_GetSelectedTextColour. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxHtmlRenderingStyle_GetSelectedTextColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxHtmlRenderingStyle_GetSelectedTextBgColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextBgColour(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingStyle_GetSelectedTextBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingStyle_GetSelectedTextBgColour. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxHtmlRenderingStyle_GetSelectedTextBgColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +static void *SwigwxDefaultHtmlRenderingStyleTowxHtmlRenderingStyle(void *ptr) { + wxDefaultHtmlRenderingStyle *src; + wxHtmlRenderingStyle *dest; + src = (wxDefaultHtmlRenderingStyle *) ptr; + dest = (wxHtmlRenderingStyle *) src; + return (void *) dest; +} + +#define wxDefaultHtmlRenderingStyle_GetSelectedTextColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextColour(_swigarg0)) +static PyObject *_wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxDefaultHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDefaultHtmlRenderingStyle_GetSelectedTextColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDefaultHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDefaultHtmlRenderingStyle_GetSelectedTextColour. Expected _wxDefaultHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxDefaultHtmlRenderingStyle_GetSelectedTextColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(_swigobj,_swigarg0) (_swigobj->GetSelectedTextBgColour(_swigarg0)) +static PyObject *_wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxColour * _result; + wxDefaultHtmlRenderingStyle * _arg0; + wxColour * _arg1; + PyObject * _argo0 = 0; + wxColour temp; + PyObject * _obj1 = 0; + char *_kwnames[] = { "self","clr", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour",_kwnames,&_argo0,&_obj1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDefaultHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour. Expected _wxDefaultHtmlRenderingStyle_p."); + return NULL; + } + } +{ + _arg1 = &temp; + if (! wxColour_helper(_obj1, &_arg1)) + return NULL; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxColour (wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(_arg0,*_arg1)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define new_wxHtmlRenderingInfo() (new wxHtmlRenderingInfo()) +static PyObject *_wrap_new_wxHtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _result; + char *_kwnames[] = { NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxHtmlRenderingInfo",_kwnames)) + return NULL; +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlRenderingInfo *)new_wxHtmlRenderingInfo(); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingInfo_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define delete_wxHtmlRenderingInfo(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxHtmlRenderingInfo(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxHtmlRenderingInfo",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxHtmlRenderingInfo. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + delete_wxHtmlRenderingInfo(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingInfo_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + wxHtmlSelection * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","s", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingInfo_SetSelection",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_SetSelection. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlSelection_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlRenderingInfo_SetSelection. Expected _wxHtmlSelection_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingInfo_SetSelection(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetSelection(_swigobj) (_swigobj->GetSelection()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlSelection * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetSelection",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetSelection. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxHtmlSelection *)wxHtmlRenderingInfo_GetSelection(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlSelection_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingInfo_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) +static PyObject *_wrap_wxHtmlRenderingInfo_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingInfo * _arg0; + wxHtmlRenderingStyle * _arg1; + PyObject * _argo0 = 0; + PyObject * _argo1 = 0; + char *_kwnames[] = { "self","style", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlRenderingInfo_SetStyle",_kwnames,&_argo0,&_argo1)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_SetStyle. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } + if (_argo1) { + if (_argo1 == Py_None) { _arg1 = NULL; } + else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxHtmlRenderingStyle_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxHtmlRenderingInfo_SetStyle. Expected _wxHtmlRenderingStyle_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingInfo_SetStyle(_arg0,_arg1); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetStyle(_swigobj) (_swigobj->GetStyle()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingStyle * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetStyle",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetStyle. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingStyle & _result_ref = wxHtmlRenderingInfo_GetStyle(_arg0); + _result = (wxHtmlRenderingStyle *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingStyle_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + +#define wxHtmlRenderingInfo_GetState(_swigobj) (_swigobj->GetState()) +static PyObject *_wrap_wxHtmlRenderingInfo_GetState(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxHtmlRenderingState * _result; + wxHtmlRenderingInfo * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlRenderingInfo_GetState",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlRenderingInfo_GetState. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + wxHtmlRenderingState & _result_ref = wxHtmlRenderingInfo_GetState(_arg0); + _result = (wxHtmlRenderingState *) &_result_ref; + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} if (_result) { + SWIG_MakePtr(_ptemp, (char *) _result,"_wxHtmlRenderingState_p"); + _resultobj = Py_BuildValue("s",_ptemp); + } else { + Py_INCREF(Py_None); + _resultobj = Py_None; + } + return _resultobj; +} + static void *SwigwxHtmlCellTowxObject(void *ptr) { wxHtmlCell *src; wxObject *dest; @@ -3101,7 +4255,7 @@ static PyObject *_wrap_wxHtmlCell_Layout(PyObject *self, PyObject *args, PyObjec return _resultobj; } -#define wxHtmlCell_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +#define wxHtmlCell_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlCell * _arg0; @@ -3110,12 +4264,14 @@ static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject int _arg3; int _arg4; int _arg5; + wxHtmlRenderingInfo * _arg6; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","dc","x","y","view_y1","view_y2", NULL }; + PyObject * _argo6 = 0; + char *_kwnames[] = { "self","dc","x","y","view_y1","view_y2","info", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiii:wxHtmlCell_Draw",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiiiO:wxHtmlCell_Draw",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3130,9 +4286,15 @@ static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject return NULL; } } + if (_argo6) { + if (SWIG_GetPtrObj(_argo6,(void **) &_arg6,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxHtmlCell_Draw. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_Draw(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5); + wxHtmlCell_Draw(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,*_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3141,19 +4303,21 @@ static PyObject *_wrap_wxHtmlCell_Draw(PyObject *self, PyObject *args, PyObject return _resultobj; } -#define wxHtmlCell_DrawInvisible(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->DrawInvisible(_swigarg0,_swigarg1,_swigarg2)) +#define wxHtmlCell_DrawInvisible(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->DrawInvisible(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) static PyObject *_wrap_wxHtmlCell_DrawInvisible(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlCell * _arg0; wxDC * _arg1; int _arg2; int _arg3; + wxHtmlRenderingInfo * _arg4; PyObject * _argo0 = 0; PyObject * _argo1 = 0; - char *_kwnames[] = { "self","dc","x","y", NULL }; + PyObject * _argo4 = 0; + char *_kwnames[] = { "self","dc","x","y","info", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxHtmlCell_DrawInvisible",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOiiO:wxHtmlCell_DrawInvisible",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3,&_argo4)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -3168,9 +4332,15 @@ static PyObject *_wrap_wxHtmlCell_DrawInvisible(PyObject *self, PyObject *args, return NULL; } } + if (_argo4) { + if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxHtmlRenderingInfo_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxHtmlCell_DrawInvisible. Expected _wxHtmlRenderingInfo_p."); + return NULL; + } + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - wxHtmlCell_DrawInvisible(_arg0,*_arg1,_arg2,_arg3); + wxHtmlCell_DrawInvisible(_arg0,*_arg1,_arg2,_arg3,*_arg4); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -3889,8 +5059,8 @@ static PyObject *_wrap_wxHtmlContainerCell_SetBorder(PyObject *self, PyObject *a return _resultobj; } -#define wxHtmlContainerCell_GetFirstCell(_swigobj) (_swigobj->GetFirstCell()) -static PyObject *_wrap_wxHtmlContainerCell_GetFirstCell(PyObject *self, PyObject *args, PyObject *kwargs) { +#define wxHtmlContainerCell_GetFirstChild(_swigobj) (_swigobj->GetFirstChild()) +static PyObject *_wrap_wxHtmlContainerCell_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxHtmlCell * _result; wxHtmlContainerCell * _arg0; @@ -3899,18 +5069,18 @@ static PyObject *_wrap_wxHtmlContainerCell_GetFirstCell(PyObject *self, PyObject char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetFirstCell",_kwnames,&_argo0)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlContainerCell_GetFirstChild",_kwnames,&_argo0)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlContainerCell_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetFirstCell. Expected _wxHtmlContainerCell_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlContainerCell_GetFirstChild. Expected _wxHtmlContainerCell_p."); return NULL; } } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxHtmlCell *)wxHtmlContainerCell_GetFirstCell(_arg0); + _result = (wxHtmlCell *)wxHtmlContainerCell_GetFirstChild(_arg0); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; @@ -6692,7 +7862,7 @@ static PyMethodDef htmlcMethods[] = { { "new_wxHtmlWidgetCell", (PyCFunction) _wrap_new_wxHtmlWidgetCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlFontCell", (PyCFunction) _wrap_new_wxHtmlFontCell, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlColourCell", (PyCFunction) _wrap_new_wxHtmlColourCell, METH_VARARGS | METH_KEYWORDS }, - { "wxHtmlContainerCell_GetFirstCell", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlContainerCell_GetFirstChild", (PyCFunction) _wrap_wxHtmlContainerCell_GetFirstChild, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBorder", (PyCFunction) _wrap_wxHtmlContainerCell_SetBorder, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_GetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlContainerCell_SetBackgroundColour", (PyCFunction) _wrap_wxHtmlContainerCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS }, @@ -6729,6 +7899,39 @@ static PyMethodDef htmlcMethods[] = { { "wxHtmlCell_GetPosY", (PyCFunction) _wrap_wxHtmlCell_GetPosY, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlCell_GetPosX", (PyCFunction) _wrap_wxHtmlCell_GetPosX, METH_VARARGS | METH_KEYWORDS }, { "new_wxHtmlCell", (PyCFunction) _wrap_new_wxHtmlCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetState", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetStyle", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_SetStyle", (PyCFunction) _wrap_wxHtmlRenderingInfo_SetStyle, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_GetSelection", (PyCFunction) _wrap_wxHtmlRenderingInfo_GetSelection, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingInfo_SetSelection", (PyCFunction) _wrap_wxHtmlRenderingInfo_SetSelection, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlRenderingInfo", (PyCFunction) _wrap_delete_wxHtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlRenderingInfo", (PyCFunction) _wrap_new_wxHtmlRenderingInfo, METH_VARARGS | METH_KEYWORDS }, + { "wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxDefaultHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_wxDefaultHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingStyle_GetSelectedTextBgColour", (PyCFunction) _wrap_wxHtmlRenderingStyle_GetSelectedTextBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingStyle_GetSelectedTextColour", (PyCFunction) _wrap_wxHtmlRenderingStyle_GetSelectedTextColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetBgColour", (PyCFunction) _wrap_wxHtmlRenderingState_GetBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetBgColour", (PyCFunction) _wrap_wxHtmlRenderingState_SetBgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetFgColour", (PyCFunction) _wrap_wxHtmlRenderingState_GetFgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetFgColour", (PyCFunction) _wrap_wxHtmlRenderingState_SetFgColour, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_GetSelectionState", (PyCFunction) _wrap_wxHtmlRenderingState_GetSelectionState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlRenderingState_SetSelectionState", (PyCFunction) _wrap_wxHtmlRenderingState_SetSelectionState, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlRenderingState", (PyCFunction) _wrap_delete_wxHtmlRenderingState, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlRenderingState", (PyCFunction) _wrap_new_wxHtmlRenderingState, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_IsEmpty", (PyCFunction) _wrap_wxHtmlSelection_IsEmpty, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_ClearPrivPos", (PyCFunction) _wrap_wxHtmlSelection_ClearPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetToPrivPos", (PyCFunction) _wrap_wxHtmlSelection_SetToPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetFromPrivPos", (PyCFunction) _wrap_wxHtmlSelection_SetFromPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToPrivPos", (PyCFunction) _wrap_wxHtmlSelection_GetToPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromPrivPos", (PyCFunction) _wrap_wxHtmlSelection_GetFromPrivPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToPos", (PyCFunction) _wrap_wxHtmlSelection_GetToPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromPos", (PyCFunction) _wrap_wxHtmlSelection_GetFromPos, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetToCell", (PyCFunction) _wrap_wxHtmlSelection_GetToCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_GetFromCell", (PyCFunction) _wrap_wxHtmlSelection_GetFromCell, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_SetCells", (PyCFunction) _wrap_wxHtmlSelection_SetCells, METH_VARARGS | METH_KEYWORDS }, + { "wxHtmlSelection_Set", (PyCFunction) _wrap_wxHtmlSelection_Set, METH_VARARGS | METH_KEYWORDS }, + { "delete_wxHtmlSelection", (PyCFunction) _wrap_delete_wxHtmlSelection, METH_VARARGS | METH_KEYWORDS }, + { "new_wxHtmlSelection", (PyCFunction) _wrap_new_wxHtmlSelection, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_ParseInner", (PyCFunction) _wrap_wxHtmlWinTagHandler_ParseInner, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_GetParser", (PyCFunction) _wrap_wxHtmlWinTagHandler_GetParser, METH_VARARGS | METH_KEYWORDS }, { "wxHtmlWinTagHandler_SetParser", (PyCFunction) _wrap_wxHtmlWinTagHandler_SetParser, METH_VARARGS | METH_KEYWORDS }, @@ -6841,6 +8044,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = { { "_wxHtmlCell","_wxHtmlContainerCell",SwigwxHtmlContainerCellTowxHtmlCell}, { "_wxHtmlCell","_wxHtmlWordCell",SwigwxHtmlWordCellTowxHtmlCell}, { "_char","_wxChar",0}, + { "_wxHtmlRenderingStyle","_wxDefaultHtmlRenderingStyle",SwigwxDefaultHtmlRenderingStyleTowxHtmlRenderingStyle}, { "_struct_wxNativeFontInfo","_wxNativeFontInfo",0}, { "_wxPyHtmlTagHandler","_wxPyHtmlWinTagHandler",SwigwxPyHtmlWinTagHandlerTowxPyHtmlTagHandler}, { "_EBool","_wxCoord",0}, @@ -6972,6 +8176,9 @@ SWIGEXPORT(void) inithtmlc() { PyDict_SetItemString(d,"wxHTML_URL_PAGE", PyInt_FromLong((long) wxHTML_URL_PAGE)); PyDict_SetItemString(d,"wxHTML_URL_IMAGE", PyInt_FromLong((long) wxHTML_URL_IMAGE)); PyDict_SetItemString(d,"wxHTML_URL_OTHER", PyInt_FromLong((long) wxHTML_URL_OTHER)); + PyDict_SetItemString(d,"wxHTML_SEL_OUT", PyInt_FromLong((long) wxHTML_SEL_OUT)); + PyDict_SetItemString(d,"wxHTML_SEL_IN", PyInt_FromLong((long) wxHTML_SEL_IN)); + PyDict_SetItemString(d,"wxHTML_SEL_CHANGING", PyInt_FromLong((long) wxHTML_SEL_CHANGING)); PyDict_SetItemString(d,"wxPAGE_ODD", PyInt_FromLong((long) wxPAGE_ODD)); PyDict_SetItemString(d,"wxPAGE_EVEN", PyInt_FromLong((long) wxPAGE_EVEN)); PyDict_SetItemString(d,"wxPAGE_ALL", PyInt_FromLong((long) wxPAGE_ALL)); diff --git a/wxPython/src/gtk/html.py b/wxPython/src/gtk/html.py index 347a11e66a..7491e86399 100644 --- a/wxPython/src/gtk/html.py +++ b/wxPython/src/gtk/html.py @@ -324,6 +324,188 @@ class wxHtmlWinTagHandler(wxHtmlWinTagHandlerPtr): +class wxHtmlSelectionPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlSelection): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def Set(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_Set(self, *_args, **_kwargs) + return val + def SetCells(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetCells(self, *_args, **_kwargs) + return val + def GetFromCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromCell(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetToCell(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToCell(self, *_args, **_kwargs) + if val: val = wxHtmlCellPtr(val) + return val + def GetFromPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetToPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetFromPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetFromPrivPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def GetToPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_GetToPrivPos(self, *_args, **_kwargs) + if val: val = wxPointPtr(val) + return val + def SetFromPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetFromPrivPos(self, *_args, **_kwargs) + return val + def SetToPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_SetToPrivPos(self, *_args, **_kwargs) + return val + def ClearPrivPos(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_ClearPrivPos(self, *_args, **_kwargs) + return val + def IsEmpty(self, *_args, **_kwargs): + val = htmlc.wxHtmlSelection_IsEmpty(self, *_args, **_kwargs) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlSelection instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlSelection(wxHtmlSelectionPtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlSelection(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxHtmlRenderingStatePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlRenderingState): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def SetSelectionState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetSelectionState(self, *_args, **_kwargs) + return val + def GetSelectionState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetSelectionState(self, *_args, **_kwargs) + return val + def SetFgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetFgColour(self, *_args, **_kwargs) + return val + def GetFgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetFgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val + def SetBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_SetBgColour(self, *_args, **_kwargs) + return val + def GetBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingState_GetBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingState instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingState(wxHtmlRenderingStatePtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlRenderingState(*_args,**_kwargs) + self.thisown = 1 + + + + +class wxHtmlRenderingStylePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelectedTextColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingStyle_GetSelectedTextColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def GetSelectedTextBgColour(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingStyle_GetSelectedTextBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingStyle(wxHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + + + + +class wxDefaultHtmlRenderingStylePtr(wxHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetSelectedTextColour(self, *_args, **_kwargs): + val = htmlc.wxDefaultHtmlRenderingStyle_GetSelectedTextColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def GetSelectedTextBgColour(self, *_args, **_kwargs): + val = htmlc.wxDefaultHtmlRenderingStyle_GetSelectedTextBgColour(self, *_args, **_kwargs) + if val: val = wxColourPtr(val) ; val.thisown = 1 + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxDefaultHtmlRenderingStyle instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxDefaultHtmlRenderingStyle(wxDefaultHtmlRenderingStylePtr): + def __init__(self,this): + self.this = this + + + + +class wxHtmlRenderingInfoPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self, delfunc=htmlc.delete_wxHtmlRenderingInfo): + if self.thisown == 1: + try: + delfunc(self) + except: + pass + def SetSelection(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_SetSelection(self, *_args, **_kwargs) + return val + def GetSelection(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetSelection(self, *_args, **_kwargs) + if val: val = wxHtmlSelectionPtr(val) + return val + def SetStyle(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_SetStyle(self, *_args, **_kwargs) + return val + def GetStyle(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetStyle(self, *_args, **_kwargs) + if val: val = wxHtmlRenderingStylePtr(val) + return val + def GetState(self, *_args, **_kwargs): + val = htmlc.wxHtmlRenderingInfo_GetState(self, *_args, **_kwargs) + if val: val = wxHtmlRenderingStatePtr(val) + return val + def __repr__(self): + return "<%s.%s instance; proxy of C++ wxHtmlRenderingInfo instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) +class wxHtmlRenderingInfo(wxHtmlRenderingInfoPtr): + def __init__(self,*_args,**_kwargs): + self.this = htmlc.new_wxHtmlRenderingInfo(*_args,**_kwargs) + self.thisown = 1 + + + + class wxHtmlCellPtr(wxObjectPtr): def __init__(self,this): self.this = this @@ -460,12 +642,13 @@ class wxHtmlContainerCellPtr(wxHtmlCellPtr): def SetBorder(self, *_args, **_kwargs): val = htmlc.wxHtmlContainerCell_SetBorder(self, *_args, **_kwargs) return val - def GetFirstCell(self, *_args, **_kwargs): - val = htmlc.wxHtmlContainerCell_GetFirstCell(self, *_args, **_kwargs) + def GetFirstChild(self, *_args, **_kwargs): + val = htmlc.wxHtmlContainerCell_GetFirstChild(self, *_args, **_kwargs) if val: val = wxHtmlCellPtr(val) return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxHtmlContainerCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + GetFirstCell = GetFirstChild class wxHtmlContainerCell(wxHtmlContainerCellPtr): def __init__(self,*_args,**_kwargs): self.this = htmlc.new_wxHtmlContainerCell(*_args,**_kwargs) @@ -812,6 +995,9 @@ wxHTML_REDIRECT = htmlc.wxHTML_REDIRECT wxHTML_URL_PAGE = htmlc.wxHTML_URL_PAGE wxHTML_URL_IMAGE = htmlc.wxHTML_URL_IMAGE wxHTML_URL_OTHER = htmlc.wxHTML_URL_OTHER +wxHTML_SEL_OUT = htmlc.wxHTML_SEL_OUT +wxHTML_SEL_IN = htmlc.wxHTML_SEL_IN +wxHTML_SEL_CHANGING = htmlc.wxHTML_SEL_CHANGING wxPAGE_ODD = htmlc.wxPAGE_ODD wxPAGE_EVEN = htmlc.wxPAGE_EVEN wxPAGE_ALL = htmlc.wxPAGE_ALL diff --git a/wxPython/src/gtk/misc.cpp b/wxPython/src/gtk/misc.cpp index c4c16c3099..644f446caa 100644 --- a/wxPython/src/gtk/misc.cpp +++ b/wxPython/src/gtk/misc.cpp @@ -55,7 +55,6 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "miscc" #include "helpers.h" -#include #include #include #include diff --git a/wxPython/src/gtk/misc2.cpp b/wxPython/src/gtk/misc2.cpp index c5ca113c0a..c22bea9bfd 100644 --- a/wxPython/src/gtk/misc2.cpp +++ b/wxPython/src/gtk/misc2.cpp @@ -56,7 +56,6 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include "pyistream.h" -#include #include #include #include @@ -73,7 +72,6 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include -//#include static PyObject* t_output_helper(PyObject* target, PyObject* o) { @@ -8593,9 +8591,9 @@ static PyObject *_wrap_wxFileType_GetExtensions(PyObject *self, PyObject *args, } static wxIcon * wxFileType_GetIcon(wxFileType *self) { - wxIcon icon; - if (self->GetIcon(&icon)) - return new wxIcon(icon); + wxIconLocation loc; + if (self->GetIcon(&loc)) + return new wxIcon(loc); else return NULL; } @@ -8634,14 +8632,18 @@ static PyObject *_wrap_wxFileType_GetIcon(PyObject *self, PyObject *args, PyObje } static PyObject * wxFileType_GetIconInfo(wxFileType *self) { - wxIcon icon; - wxString iconFile; - int iconIndex; - if (self->GetIcon(&icon, &iconFile, &iconIndex)) { + wxIconLocation loc; + if (self->GetIcon(&loc)) { + wxString iconFile = loc.GetFileName(); + int iconIndex = -1; +#ifdef __WXMSW__ + iconIndex = loc.GetIndex(); +#endif + // Make a tuple and put the values in it wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(3); - PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon), - wxT("wxIcon"), TRUE)); + PyTuple_SetItem(tuple, 0, + wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), TRUE)); #if wxUSE_UNICODE PyTuple_SetItem(tuple, 1, PyUnicode_FromWideChar(iconFile.c_str(), iconFile.Len())); #else @@ -10282,34 +10284,6 @@ static PyObject *_wrap_wxFileHistory_GetCount(PyObject *self, PyObject *args, Py return _resultobj; } -#define wxFileHistory_GetNoHistoryFiles(_swigobj) (_swigobj->GetNoHistoryFiles()) -static PyObject *_wrap_wxFileHistory_GetNoHistoryFiles(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - int _result; - wxFileHistory * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileHistory_GetNoHistoryFiles",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFileHistory_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFileHistory_GetNoHistoryFiles. Expected _wxFileHistory_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (int )wxFileHistory_GetNoHistoryFiles(_arg0); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} _resultobj = Py_BuildValue("i",_result); - return _resultobj; -} - static void *SwigwxEffectsTowxObject(void *ptr) { wxEffects *src; wxObject *dest; @@ -11041,7 +11015,6 @@ static PyMethodDef misc2cMethods[] = { { "wxEffects_GetLightShadow", (PyCFunction) _wrap_wxEffects_GetLightShadow, METH_VARARGS | METH_KEYWORDS }, { "wxEffects_GetHighlightColour", (PyCFunction) _wrap_wxEffects_GetHighlightColour, METH_VARARGS | METH_KEYWORDS }, { "new_wxEffects", (PyCFunction) _wrap_new_wxEffects, METH_VARARGS | METH_KEYWORDS }, - { "wxFileHistory_GetNoHistoryFiles", (PyCFunction) _wrap_wxFileHistory_GetNoHistoryFiles, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_GetCount", (PyCFunction) _wrap_wxFileHistory_GetCount, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_GetHistoryFile", (PyCFunction) _wrap_wxFileHistory_GetHistoryFile, METH_VARARGS | METH_KEYWORDS }, { "wxFileHistory_AddFilesToThisMenu", (PyCFunction) _wrap_wxFileHistory_AddFilesToThisMenu, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/misc2.py b/wxPython/src/gtk/misc2.py index 376b6d6adf..7b26ea4b0f 100644 --- a/wxPython/src/gtk/misc2.py +++ b/wxPython/src/gtk/misc2.py @@ -1060,11 +1060,9 @@ class wxFileHistoryPtr(wxObjectPtr): def GetCount(self, *_args, **_kwargs): val = misc2c.wxFileHistory_GetCount(self, *_args, **_kwargs) return val - def GetNoHistoryFiles(self, *_args, **_kwargs): - val = misc2c.wxFileHistory_GetNoHistoryFiles(self, *_args, **_kwargs) - return val def __repr__(self): return "<%s.%s instance; proxy of C++ wxFileHistory instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) + GetNoHistoryFiles = GetCount class wxFileHistory(wxFileHistoryPtr): def __init__(self,*_args,**_kwargs): self.this = misc2c.new_wxFileHistory(*_args,**_kwargs) diff --git a/wxPython/src/helpers.cpp b/wxPython/src/helpers.cpp index a425d6cf1f..4c9f9beca8 100644 --- a/wxPython/src/helpers.cpp +++ b/wxPython/src/helpers.cpp @@ -28,6 +28,9 @@ #include #endif +#include +#include + //---------------------------------------------------------------------- #if PYTHON_API_VERSION <= 1007 && wxUSE_UNICODE @@ -36,14 +39,6 @@ //---------------------------------------------------------------------- -#ifdef __WXGTK__ -int WXDLLEXPORT wxEntryStart( int& argc, char** argv ); -#else -int WXDLLEXPORT wxEntryStart( int argc, char** argv ); -#endif -int WXDLLEXPORT wxEntryInitGui(); -void WXDLLEXPORT wxEntryCleanup(); - wxPyApp* wxPythonApp = NULL; // Global instance of application object bool wxPyDoCleanup = FALSE; bool wxPyDoingCleanup = FALSE; @@ -334,6 +329,7 @@ void wxPyApp::SetMacHelpMenuTitleName(const wxString& val) { //---------------------------------------------------------------------- +#if 0 static char* wxPyCopyCString(const wxChar* src) { wxWX2MBbuf buff = (wxWX2MBbuf)wxConvCurrent->cWX2MB(src); @@ -366,13 +362,13 @@ static wxChar* wxPyCopyWString(const wxChar *src) return copystring(src); } #endif +#endif //---------------------------------------------------------------------- -// This is where we pick up the first part of the wxEntry functionality... -// The rest is in __wxStart and __wxCleanup. This function is called when -// wxcmodule is imported. (Before there is a wxApp object.) +// This function is called when the wxc module is imported to do some initial +// setup. (Before there is a wxApp object.) void __wxPreStart(PyObject* moduleDict) { @@ -386,76 +382,60 @@ void __wxPreStart(PyObject* moduleDict) wxPyTMutex = new wxMutex; #endif - // Restore default signal handlers, (prevents crash upon Ctrl-C in the - // console that launched a wxPython app...) - PyOS_FiniInterrupts(); - + // Ensure that the build options in the DLL (or whatever) match this build wxApp::CheckBuildOptions(wxBuildOptions()); + // Create an exception object to use for wxASSERTions wxPyAssertionError = PyErr_NewException("wxPython.wxc.wxPyAssertionError", PyExc_AssertionError, NULL); PyDict_SetItemString(moduleDict, "wxPyAssertionError", wxPyAssertionError); - - - // Bail out if there is already a wxApp created. This means that the - // toolkit has already been initialized, as in embedding wxPython in - // a C++ wxWindows app, so we don't need to call wxEntryStart. - if (wxTheApp != NULL) { - return; - } - wxPyDoCleanup = TRUE; - - int argc = 0; - char** argv = NULL; - PyObject* sysargv = PySys_GetObject("argv"); - if (sysargv != NULL) { - argc = PyList_Size(sysargv); - argv = new char*[argc+1]; - int x; - for(x=0; xargc = argc; - wxPythonApp->argv = argv; + if (! wxEntryStart(argc, argv) ) { + PyErr_SetString(PyExc_SystemError, // is this the right one? + "wxEntryStart failed!"); + goto error; + } + delete [] argv; + - wxEntryInitGui(); + // The stock objects were all NULL when they were loaded into + // SWIG generated proxies, so re-init those now... + wxPy_ReinitStockObjects(); - // Call the Python App's OnInit function + + // Call the Python wxApp's OnInit function arglist = PyTuple_New(0); result = PyEval_CallObject(onInitFunc, arglist); Py_DECREF(arglist); @@ -463,7 +443,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) return NULL; } - PyObject* pyint = PyNumber_Int(result); + pyint = PyNumber_Int(result); if (! pyint) { PyErr_SetString(PyExc_TypeError, "OnInit should return a boolean value"); goto error; @@ -490,6 +470,7 @@ PyObject* __wxStart(PyObject* /* self */, PyObject* args) } + void __wxCleanup() { wxPyDoingCleanup = TRUE; if (wxPyDoCleanup) @@ -552,6 +533,102 @@ PyObject* __wxSetDictionary(PyObject* /* self */, PyObject* args) return Py_None; } + +//--------------------------------------------------------------------------- + +// The stock objects are no longer created when the wxc module is imported, but +// only after the app object has been created. This function will be called before +// OnInit is called so we can hack the new pointer values into the obj.this attributes. + +void wxPy_ReinitStockObjects() +{ + char ptrbuf[128]; + PyObject* obj; + PyObject* ptrobj; + + + +#define REINITOBJ(name, type) \ + obj = PyDict_GetItemString(wxPython_dict, #name); \ + wxASSERT_MSG(obj != NULL, wxT("Unable to find stock object for " #name)); \ + SWIG_MakePtr(ptrbuf, (char *) name, "_" #type "_p"); \ + ptrobj = PyString_FromString(ptrbuf); \ + PyObject_SetAttrString(obj, "this", ptrobj); \ + Py_DECREF(ptrobj) + +#define REINITOBJ2(name, type) \ + obj = PyDict_GetItemString(wxPython_dict, #name); \ + wxASSERT_MSG(obj != NULL, wxT("Unable to find stock object for " #name)); \ + SWIG_MakePtr(ptrbuf, (char *) &name, "_" #type "_p"); \ + ptrobj = PyString_FromString(ptrbuf); \ + PyObject_SetAttrString(obj, "this", ptrobj); \ + Py_DECREF(ptrobj) + + + REINITOBJ(wxNORMAL_FONT, wxFont); + REINITOBJ(wxSMALL_FONT, wxFont); + REINITOBJ(wxITALIC_FONT, wxFont); + REINITOBJ(wxSWISS_FONT, wxFont); + + REINITOBJ(wxRED_PEN, wxPen); + REINITOBJ(wxCYAN_PEN, wxPen); + REINITOBJ(wxGREEN_PEN, wxPen); + REINITOBJ(wxBLACK_PEN, wxPen); + REINITOBJ(wxWHITE_PEN, wxPen); + REINITOBJ(wxTRANSPARENT_PEN, wxPen); + REINITOBJ(wxBLACK_DASHED_PEN, wxPen); + REINITOBJ(wxGREY_PEN, wxPen); + REINITOBJ(wxMEDIUM_GREY_PEN, wxPen); + REINITOBJ(wxLIGHT_GREY_PEN, wxPen); + + REINITOBJ(wxBLUE_BRUSH, wxBrush); + REINITOBJ(wxGREEN_BRUSH, wxBrush); + REINITOBJ(wxWHITE_BRUSH, wxBrush); + REINITOBJ(wxBLACK_BRUSH, wxBrush); + REINITOBJ(wxTRANSPARENT_BRUSH, wxBrush); + REINITOBJ(wxCYAN_BRUSH, wxBrush); + REINITOBJ(wxRED_BRUSH, wxBrush); + REINITOBJ(wxGREY_BRUSH, wxBrush); + REINITOBJ(wxMEDIUM_GREY_BRUSH, wxBrush); + REINITOBJ(wxLIGHT_GREY_BRUSH, wxBrush); + + REINITOBJ(wxBLACK, wxColour); + REINITOBJ(wxWHITE, wxColour); + REINITOBJ(wxRED, wxColour); + REINITOBJ(wxBLUE, wxColour); + REINITOBJ(wxGREEN, wxColour); + REINITOBJ(wxCYAN, wxColour); + REINITOBJ(wxLIGHT_GREY, wxColour); + + REINITOBJ(wxSTANDARD_CURSOR, wxCursor); + REINITOBJ(wxHOURGLASS_CURSOR, wxCursor); + REINITOBJ(wxCROSS_CURSOR, wxCursor); + + REINITOBJ2(wxNullBitmap, wxBitmap); + REINITOBJ2(wxNullIcon, wxIcon); + REINITOBJ2(wxNullCursor, wxCursor); + REINITOBJ2(wxNullPen, wxPen); + REINITOBJ2(wxNullBrush, wxBrush); + REINITOBJ2(wxNullPalette, wxPalette); + REINITOBJ2(wxNullFont, wxFont); + REINITOBJ2(wxNullColour, wxColour); + + REINITOBJ(wxTheFontList, wxFontList); + REINITOBJ(wxThePenList, wxPenList); + REINITOBJ(wxTheBrushList, wxBrushList); + REINITOBJ(wxTheColourDatabase, wxColourDatabase); + + + REINITOBJ(wxTheClipboard, wxClipboard); + REINITOBJ(wxTheMimeTypesManager, wxMimeTypesManager); + REINITOBJ2(wxDefaultValidator, wxValidator); + REINITOBJ2(wxNullImage, wxImage); + REINITOBJ2(wxNullAcceleratorTable, wxAcceleratorTable); + +#undef REINITOBJ +#undef REINITOBJ2 +} + //--------------------------------------------------------------------------- void wxPyClientData_dtor(wxPyClientData* self) { diff --git a/wxPython/src/helpers.h b/wxPython/src/helpers.h index e731fb51df..e90e872415 100644 --- a/wxPython/src/helpers.h +++ b/wxPython/src/helpers.h @@ -48,6 +48,9 @@ void wxPyPtrTypeMap_Add(const char* commonName, const char* ptrName); PyObject* wxPy_ConvertList(wxListBase* list, const char* className); long wxPyGetWinHandle(wxWindow* win); +void wxPy_ReinitStockObjects(); + + //---------------------------------------------------------------------- // if we want to handle threads and Python threads are available... diff --git a/wxPython/src/html.i b/wxPython/src/html.i index 7c83c30edf..fb04f2d16e 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -369,6 +369,103 @@ private: //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- + +// wxHtmlSelection is data holder with information about text selection. +// Selection is defined by two positions (beginning and end of the selection) +// and two leaf(!) cells at these positions. +class wxHtmlSelection +{ +public: + wxHtmlSelection(); + ~wxHtmlSelection(); + + void Set(const wxPoint& fromPos, const wxHtmlCell *fromCell, + const wxPoint& toPos, const wxHtmlCell *toCell); + %name(SetCells)void Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell); + + const wxHtmlCell *GetFromCell() const; + const wxHtmlCell *GetToCell() const; + + // these values are in absolute coordinates: + const wxPoint& GetFromPos() const; + const wxPoint& GetToPos() const; + + // these are From/ToCell's private data + const wxPoint& GetFromPrivPos() const; + const wxPoint& GetToPrivPos() const; + void SetFromPrivPos(const wxPoint& pos); + void SetToPrivPos(const wxPoint& pos); + void ClearPrivPos(); + + const bool IsEmpty() const; + +}; + + +enum wxHtmlSelectionState +{ + wxHTML_SEL_OUT, // currently rendered cell is outside the selection + wxHTML_SEL_IN, // ... is inside selection + wxHTML_SEL_CHANGING // ... is the cell on which selection state changes +}; + +// Selection state is passed to wxHtmlCell::Draw so that it can render itself +// differently e.g. when inside text selection or outside it. +class wxHtmlRenderingState +{ +public: + wxHtmlRenderingState(); + ~wxHtmlRenderingState(); + + void SetSelectionState(wxHtmlSelectionState s); + wxHtmlSelectionState GetSelectionState() const; + + void SetFgColour(const wxColour& c); + const wxColour& GetFgColour() const; + void SetBgColour(const wxColour& c); + const wxColour& GetBgColour() const; +}; + + +// HTML rendering customization. This class is used when rendering wxHtmlCells +// as a callback: +class wxHtmlRenderingStyle +{ +public: + virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0; + virtual wxColour GetSelectedTextBgColour(const wxColour& clr) = 0; +}; + +// Standard style: +class wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle +{ +public: + virtual wxColour GetSelectedTextColour(const wxColour& clr); + virtual wxColour GetSelectedTextBgColour(const wxColour& clr); +}; + + + +// Information given to cells when drawing them. Contains rendering state, +// selection information and rendering style object that can be used to +// customize the output. +class wxHtmlRenderingInfo +{ +public: + wxHtmlRenderingInfo(); + ~wxHtmlRenderingInfo(); + + void SetSelection(wxHtmlSelection *s); + wxHtmlSelection *GetSelection() const; + + void SetStyle(wxHtmlRenderingStyle *style); + wxHtmlRenderingStyle& GetStyle(); + + wxHtmlRenderingState& GetState(); +}; + +//--------------------------------------------------------------------------- + class wxHtmlCell : public wxObject { public: wxHtmlCell(); @@ -386,8 +483,10 @@ public: void SetParent(wxHtmlContainerCell *p); void SetPos(int x, int y); void Layout(int w); - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); - void DrawInvisible(wxDC& dc, int x, int y); + void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, + wxHtmlRenderingInfo& info); + void DrawInvisible(wxDC& dc, int x, int y, + wxHtmlRenderingInfo& info); const wxHtmlCell* Find(int condition, const void* param); bool AdjustPagebreak(int* INOUT); @@ -422,7 +521,8 @@ public: void SetBackgroundColour(const wxColour& clr); wxColour GetBackgroundColour(); void SetBorder(const wxColour& clr1, const wxColour& clr2); - wxHtmlCell* GetFirstCell(); + wxHtmlCell* GetFirstChild(); + %pragma(python) addtoclass = "GetFirstCell = GetFirstChild" }; diff --git a/wxPython/src/image.i b/wxPython/src/image.i index ee6606d097..db19f47d72 100644 --- a/wxPython/src/image.i +++ b/wxPython/src/image.i @@ -399,6 +399,7 @@ void wxInitAllImageHandlers(); #if 0 %} +// See also wxPy_ReinitStockObjects in helpers.cpp extern wxImage wxNullImage; %readwrite diff --git a/wxPython/src/misc.i b/wxPython/src/misc.i index 1719b55c64..97e7ffb2cf 100644 --- a/wxPython/src/misc.i +++ b/wxPython/src/misc.i @@ -14,7 +14,6 @@ %{ #include "helpers.h" -#include #include #include #include @@ -666,6 +665,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label); #if 0 // we want to use the definition from the header, not the // one SWIG will generate. %} +// See also wxPy_ReinitStockObjects in helpers.cpp extern wxAcceleratorTable wxNullAcceleratorTable; %{ #endif diff --git a/wxPython/src/misc2.i b/wxPython/src/misc2.i index 5d61038132..214c510dcd 100644 --- a/wxPython/src/misc2.i +++ b/wxPython/src/misc2.i @@ -17,7 +17,6 @@ %{ #include "helpers.h" #include "pyistream.h" -#include #include #include #include @@ -34,7 +33,6 @@ #include #include #include -//#include %} //---------------------------------------------------------------------- @@ -1251,9 +1249,9 @@ public: %addmethods { // Get the icon corresponding to this file type %new wxIcon* GetIcon() { - wxIcon icon; - if (self->GetIcon(&icon)) - return new wxIcon(icon); + wxIconLocation loc; + if (self->GetIcon(&loc)) + return new wxIcon(loc); else return NULL; } @@ -1261,14 +1259,18 @@ public: // Get the icon corresponding to this file type, the name of the file // where this icon resides, and its index in this file if applicable. PyObject* GetIconInfo() { - wxIcon icon; - wxString iconFile; - int iconIndex; - if (self->GetIcon(&icon, &iconFile, &iconIndex)) { + wxIconLocation loc; + if (self->GetIcon(&loc)) { + wxString iconFile = loc.GetFileName(); + int iconIndex = -1; +#ifdef __WXMSW__ + iconIndex = loc.GetIndex(); +#endif + // Make a tuple and put the values in it wxPyBeginBlockThreads(); PyObject* tuple = PyTuple_New(3); - PyTuple_SetItem(tuple, 0, wxPyConstructObject(new wxIcon(icon), - wxT("wxIcon"), TRUE)); + PyTuple_SetItem(tuple, 0, + wxPyConstructObject(new wxIcon(loc), wxT("wxIcon"), TRUE)); #if wxUSE_UNICODE PyTuple_SetItem(tuple, 1, PyUnicode_FromWideChar(iconFile.c_str(), iconFile.Len())); #else @@ -1470,6 +1472,7 @@ public: %{ #if 0 %} +// See also wxPy_ReinitStockObjects in helpers.cpp extern wxMimeTypesManager* wxTheMimeTypesManager; %{ #endif @@ -1627,9 +1630,8 @@ public: // Accessors wxString GetHistoryFile(int i) const; - // A synonym for GetNoHistoryFiles int GetCount() const; - int GetNoHistoryFiles() const; + %pragma(python) addtoclass = "GetNoHistoryFiles = GetCount" };