Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWIGged updates for wxMac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-04-09 19:43:17 +00:00
parent 5d5c8aa70e
commit ed23e4b31b
6 changed files with 1038 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wxPython/src/mac/controls2.py
View File

@@ -831,7 +831,11 @@ class wxTreeItemIdPtr :
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxTreeItemId instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
Ok = IsOk
def __nonzero__(self):
return self.IsOk()
class wxTreeItemId(wxTreeItemIdPtr):
def __init__(self,*_args,**_kwargs):
self.this = controls2c.new_wxTreeItemId(*_args,**_kwargs)

192
wxPython/src/mac/html.cpp
View File

@@ -1495,18 +1495,18 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args,
}
static void wxHtmlWinParser_SetFonts(wxHtmlWinParser *self,wxString normal_face,wxString fixed_face,PyObject * sizes) {
int* temp = int_LIST_helper(sizes);
if (temp) {
self->SetFonts(normal_face, fixed_face, temp);
int* temp = NULL;
if (sizes) temp = int_LIST_helper(sizes);
self->SetFonts(normal_face, fixed_face, temp);
if (temp)
delete [] temp;
}
}
static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxHtmlWinParser * _arg0;
wxString * _arg1;
wxString * _arg2;
PyObject * _arg3;
PyObject * _arg3 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
@@ -1514,7 +1514,7 @@ static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args,
char *_kwnames[] = { "self","normal_face","fixed_face","sizes", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWinParser_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxHtmlWinParser_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1533,6 +1533,7 @@ static PyObject *_wrap_wxHtmlWinParser_SetFonts(PyObject *self, PyObject *args,
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = _obj3;
}
@@ -4464,6 +4465,45 @@ static PyObject *_wrap_wxHtmlWindow_LoadPage(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxHtmlWindow_LoadFile(_swigobj,_swigarg0) (_swigobj->LoadFile(_swigarg0))
static PyObject *_wrap_wxHtmlWindow_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxPyHtmlWindow * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","filename", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlWindow_LoadFile",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyHtmlWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlWindow_LoadFile. Expected _wxPyHtmlWindow_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxHtmlWindow_LoadFile(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxHtmlWindow_AppendToPage(_swigobj,_swigarg0) (_swigobj->AppendToPage(_swigarg0))
static PyObject *_wrap_wxHtmlWindow_AppendToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -4720,18 +4760,18 @@ static PyObject *_wrap_wxHtmlWindow_SetRelatedStatusBar(PyObject *self, PyObject
}
static void wxPyHtmlWindow_SetFonts(wxPyHtmlWindow *self,wxString normal_face,wxString fixed_face,PyObject * sizes) {
int* temp = int_LIST_helper(sizes);
if (temp) {
self->SetFonts(normal_face, fixed_face, temp);
int* temp = NULL;
if (sizes) temp = int_LIST_helper(sizes);
self->SetFonts(normal_face, fixed_face, temp);
if (temp)
delete [] temp;
}
}
static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxPyHtmlWindow * _arg0;
wxString * _arg1;
wxString * _arg2;
PyObject * _arg3;
PyObject * _arg3 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
@@ -4739,7 +4779,7 @@ static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyO
char *_kwnames[] = { "self","normal_face","fixed_face","sizes", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO:wxHtmlWindow_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxHtmlWindow_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4758,6 +4798,7 @@ static PyObject *_wrap_wxHtmlWindow_SetFonts(PyObject *self, PyObject *args, PyO
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = _obj3;
}
@@ -5606,6 +5647,68 @@ static PyObject *_wrap_wxHtmlDCRenderer_SetHtmlText(PyObject *self, PyObject *ar
return _resultobj;
}
static void wxHtmlDCRenderer_SetFonts(wxHtmlDCRenderer *self,wxString normal_face,wxString fixed_face,PyObject * sizes) {
int* temp = NULL;
if (sizes) temp = int_LIST_helper(sizes);
self->SetFonts(normal_face, fixed_face, temp);
if (temp)
delete [] temp;
}
static PyObject *_wrap_wxHtmlDCRenderer_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxHtmlDCRenderer * _arg0;
wxString * _arg1;
wxString * _arg2;
PyObject * _arg3 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
char *_kwnames[] = { "self","normal_face","fixed_face","sizes", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxHtmlDCRenderer_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlDCRenderer_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlDCRenderer_SetFonts. Expected _wxHtmlDCRenderer_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = _obj3;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHtmlDCRenderer_SetFonts(_arg0,*_arg1,*_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
return _resultobj;
}
#define wxHtmlDCRenderer_Render(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->Render(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
static PyObject *_wrap_wxHtmlDCRenderer_Render(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -5893,6 +5996,68 @@ static PyObject *_wrap_wxHtmlPrintout_SetFooter(PyObject *self, PyObject *args,
return _resultobj;
}
static void wxHtmlPrintout_SetFonts(wxHtmlPrintout *self,wxString normal_face,wxString fixed_face,PyObject * sizes) {
int* temp = NULL;
if (sizes) temp = int_LIST_helper(sizes);
self->SetFonts(normal_face, fixed_face, temp);
if (temp)
delete [] temp;
}
static PyObject *_wrap_wxHtmlPrintout_SetFonts(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxHtmlPrintout * _arg0;
wxString * _arg1;
wxString * _arg2;
PyObject * _arg3 = (PyObject *) NULL;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
PyObject * _obj3 = 0;
char *_kwnames[] = { "self","normal_face","fixed_face","sizes", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxHtmlPrintout_SetFonts",_kwnames,&_argo0,&_obj1,&_obj2,&_obj3))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlPrintout_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlPrintout_SetFonts. Expected _wxHtmlPrintout_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
if (_obj3)
{
_arg3 = _obj3;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxHtmlPrintout_SetFonts(_arg0,*_arg1,*_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
return _resultobj;
}
#define wxHtmlPrintout_SetMargins(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->SetMargins(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxHtmlPrintout_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6409,6 +6574,7 @@ static PyMethodDef htmlcMethods[] = {
{ "delete_wxHtmlEasyPrinting", (PyCFunction) _wrap_delete_wxHtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
{ "new_wxHtmlEasyPrinting", (PyCFunction) _wrap_new_wxHtmlEasyPrinting, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlPrintout_SetMargins", (PyCFunction) _wrap_wxHtmlPrintout_SetMargins, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlPrintout_SetFonts", (PyCFunction) _wrap_wxHtmlPrintout_SetFonts, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlPrintout_SetFooter", (PyCFunction) _wrap_wxHtmlPrintout_SetFooter, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlPrintout_SetHeader", (PyCFunction) _wrap_wxHtmlPrintout_SetHeader, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlPrintout_SetHtmlFile", (PyCFunction) _wrap_wxHtmlPrintout_SetHtmlFile, METH_VARARGS | METH_KEYWORDS },
@@ -6416,6 +6582,7 @@ static PyMethodDef htmlcMethods[] = {
{ "new_wxHtmlPrintout", (PyCFunction) _wrap_new_wxHtmlPrintout, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_GetTotalHeight", (PyCFunction) _wrap_wxHtmlDCRenderer_GetTotalHeight, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_Render", (PyCFunction) _wrap_wxHtmlDCRenderer_Render, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_SetFonts", (PyCFunction) _wrap_wxHtmlDCRenderer_SetFonts, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_SetHtmlText", (PyCFunction) _wrap_wxHtmlDCRenderer_SetHtmlText, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_SetSize", (PyCFunction) _wrap_wxHtmlDCRenderer_SetSize, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlDCRenderer_SetDC", (PyCFunction) _wrap_wxHtmlDCRenderer_SetDC, METH_VARARGS | METH_KEYWORDS },
@@ -6447,6 +6614,7 @@ static PyMethodDef htmlcMethods[] = {
{ "wxHtmlWindow_GetOpenedAnchor", (PyCFunction) _wrap_wxHtmlWindow_GetOpenedAnchor, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow_GetOpenedPage", (PyCFunction) _wrap_wxHtmlWindow_GetOpenedPage, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow_AppendToPage", (PyCFunction) _wrap_wxHtmlWindow_AppendToPage, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow_LoadFile", (PyCFunction) _wrap_wxHtmlWindow_LoadFile, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow_LoadPage", (PyCFunction) _wrap_wxHtmlWindow_LoadPage, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow_SetPage", (PyCFunction) _wrap_wxHtmlWindow_SetPage, METH_VARARGS | METH_KEYWORDS },
{ "wxHtmlWindow__setCallbackInfo", (PyCFunction) _wrap_wxHtmlWindow__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },

9
wxPython/src/mac/html.py
View File

@@ -550,6 +550,9 @@ class wxHtmlWindowPtr(wxScrolledWindowPtr):
def LoadPage(self, *_args, **_kwargs):
val = htmlc.wxHtmlWindow_LoadPage(self, *_args, **_kwargs)
return val
def LoadFile(self, *_args, **_kwargs):
val = htmlc.wxHtmlWindow_LoadFile(self, *_args, **_kwargs)
return val
def AppendToPage(self, *_args, **_kwargs):
val = htmlc.wxHtmlWindow_AppendToPage(self, *_args, **_kwargs)
return val
@@ -664,6 +667,9 @@ class wxHtmlDCRendererPtr(wxObjectPtr):
def SetHtmlText(self, *_args, **_kwargs):
val = htmlc.wxHtmlDCRenderer_SetHtmlText(self, *_args, **_kwargs)
return val
def SetFonts(self, *_args, **_kwargs):
val = htmlc.wxHtmlDCRenderer_SetFonts(self, *_args, **_kwargs)
return val
def Render(self, *_args, **_kwargs):
val = htmlc.wxHtmlDCRenderer_Render(self, *_args, **_kwargs)
return val
@@ -696,6 +702,9 @@ class wxHtmlPrintoutPtr(wxPrintoutPtr):
def SetFooter(self, *_args, **_kwargs):
val = htmlc.wxHtmlPrintout_SetFooter(self, *_args, **_kwargs)
return val
def SetFonts(self, *_args, **_kwargs):
val = htmlc.wxHtmlPrintout_SetFonts(self, *_args, **_kwargs)
return val
def SetMargins(self, *_args, **_kwargs):
val = htmlc.wxHtmlPrintout_SetMargins(self, *_args, **_kwargs)
return val

30
wxPython/src/mac/wx.py
View File

@@ -1610,6 +1610,8 @@ if wxPlatform == "__WXGTK__":
except:
pass
# On MSW add the directory where the wxWindows catalogs were installed
# to the default catalog path.
if wxPlatform == "__WXMSW__":
import os
localedir = os.path.join(os.path.split(__file__)[0], "locale")
@@ -1735,6 +1737,34 @@ class _wxPyDeadObject:
def __nonzero__(self):
return 0
#----------------------------------------------------------------------
class wxNotebookPage(wxPanel):
"""
There is an old (and apparently unsolvable) bug when placing a
window with a nonstandard background colour in a wxNotebook, as
the notbooks's background colour would always be used when the
window is refreshed. The solution is to place a panel in the
notbook and the coloured window o nthe panel, sized to cover the
panel. This simple class does that for you, just put an instance
of this in the notebook and make your regular window a child of
this one and it will handle the resize for you.
"""
def __init__(self, parent, id=-1,
pos=wxDefaultPosition, size=wxDefaultSize,
style=wxTAB_TRAVERSAL, name="panel"):
wxPanel.__init__(self, parent, id, pos, size, style, name)
self.child = None
EVT_SIZE(self, self.OnSize)
def OnSize(self, evt):
if self.child is None:
children = self.GetChildren()
if len(children):
self.child = children[0]
if self.child:
self.child.SetPosition((0,0))
self.child.SetSize(self.GetSize())
#----------------------------------------------------------------------
#----------------------------------------------------------------------