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

SWIGged updates for wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-06-12 00:29:28 +00:00
parent 1f1c4a921b
commit 0cbe0b1784
8 changed files with 394 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/src/gtk/html.cpp
View File

@@ -1314,7 +1314,7 @@ static void *SwigwxHtmlWinParserTowxObject(void *ptr) {
static PyObject *_wrap_new_wxHtmlWinParser(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_new_wxHtmlWinParser(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxHtmlWinParser * _result; wxHtmlWinParser * _result;
wxHtmlWindow * _arg0 = (wxHtmlWindow *) NULL; wxPyHtmlWindow * _arg0 = (wxPyHtmlWindow *) NULL;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
char *_kwnames[] = { "wnd", NULL }; char *_kwnames[] = { "wnd", NULL };
char _ptemp[128]; char _ptemp[128];
@@ -1324,8 +1324,8 @@ static PyObject *_wrap_new_wxHtmlWinParser(PyObject *self, PyObject *args, PyObj
return NULL; return NULL;
if (_argo0) { if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; } if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlWindow_p")) { else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyHtmlWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxHtmlWinParser. Expected _wxHtmlWindow_p."); PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxHtmlWinParser. Expected _wxPyHtmlWindow_p.");
return NULL; return NULL;
} }
} }
@@ -1469,10 +1469,11 @@ static PyObject *_wrap_wxHtmlWinParser_GetCharWidth(PyObject *self, PyObject *ar
#define wxHtmlWinParser_GetWindow(_swigobj) (_swigobj->GetWindow()) #define wxHtmlWinParser_GetWindow(_swigobj) (_swigobj->GetWindow())
static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
wxHtmlWindow * _result; wxPyHtmlWindow * _result;
wxHtmlWinParser * _arg0; wxHtmlWinParser * _arg0;
PyObject * _argo0 = 0; PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL }; char *_kwnames[] = { "self", NULL };
char _ptemp[128];
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlWinParser_GetWindow",_kwnames,&_argo0)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxHtmlWinParser_GetWindow",_kwnames,&_argo0))
@@ -1486,11 +1487,17 @@ static PyObject *_wrap_wxHtmlWinParser_GetWindow(PyObject *self, PyObject *args,
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxHtmlWindow *)wxHtmlWinParser_GetWindow(_arg0); _result = (wxPyHtmlWindow *)wxHtmlWinParser_GetWindow(_arg0);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); } } if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyHtmlWindow_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj; return _resultobj;
} }

1
wxPython/src/gtk/html.py
View File

@@ -177,6 +177,7 @@ class wxHtmlWinParserPtr(wxHtmlParserPtr):
return val return val
def GetWindow(self, *_args, **_kwargs): def GetWindow(self, *_args, **_kwargs):
val = htmlc.wxHtmlWinParser_GetWindow(self, *_args, **_kwargs) val = htmlc.wxHtmlWinParser_GetWindow(self, *_args, **_kwargs)
if val: val = wxHtmlWindowPtr(val)
return val return val
def SetFonts(self, *_args, **_kwargs): def SetFonts(self, *_args, **_kwargs):
val = htmlc.wxHtmlWinParser_SetFonts(self, *_args, **_kwargs) val = htmlc.wxHtmlWinParser_SetFonts(self, *_args, **_kwargs)

9
wxPython/src/gtk/printfw.cpp
View File

@@ -178,7 +178,14 @@ public:
PYPRIVATE; PYPRIVATE;
}; };
IMPLEMENT_CLASS( wxPyPrintPreview, wxPrintPreview ); // Stupid renamed classes... Fix this in 2.5...
#if defined(__WXMSW__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxWindowsPrintPreview );
#elif defined(__WXMAC__)
IMPLEMENT_CLASS( wxPyPrintPreview, wxMacPrintPreview );
#else
IMPLEMENT_CLASS( wxPyPrintPreview, wxPostScriptPrintPreview );
#endif
IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage); IMP_PYCALLBACK_BOOL_INT (wxPyPrintPreview, wxPrintPreview, SetCurrentPage);
IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage); IMP_PYCALLBACK_BOOL_WXWINDC(wxPyPrintPreview, wxPrintPreview, PaintPage);

989
wxPython/src/gtk/sizers.cpp
View File

File diff suppressed because it is too large Load Diff

176
wxPython/src/gtk/sizers.py
View File

@@ -119,41 +119,20 @@ class wxSizerPtr(wxObjectPtr):
def Destroy(self, *_args, **_kwargs): def Destroy(self, *_args, **_kwargs):
val = sizersc.wxSizer_Destroy(self, *_args, **_kwargs) val = sizersc.wxSizer_Destroy(self, *_args, **_kwargs)
return val return val
def AddWindow(self, *_args, **_kwargs): def _Add(self, *_args, **_kwargs):
val = sizersc.wxSizer_AddWindow(self, *_args, **_kwargs) val = sizersc.wxSizer__Add(self, *_args, **_kwargs)
return val return val
def AddSizer(self, *_args, **_kwargs): def _Insert(self, *_args, **_kwargs):
val = sizersc.wxSizer_AddSizer(self, *_args, **_kwargs) val = sizersc.wxSizer__Insert(self, *_args, **_kwargs)
return val return val
def AddSpacer(self, *_args, **_kwargs): def _Prepend(self, *_args, **_kwargs):
val = sizersc.wxSizer_AddSpacer(self, *_args, **_kwargs) val = sizersc.wxSizer__Prepend(self, *_args, **_kwargs)
return val return val
def InsertWindow(self, *_args, **_kwargs): def Remove(self, *_args, **_kwargs):
val = sizersc.wxSizer_InsertWindow(self, *_args, **_kwargs) val = sizersc.wxSizer_Remove(self, *_args, **_kwargs)
return val return val
def InsertSizer(self, *_args, **_kwargs): def _SetItemMinSize(self, *_args, **_kwargs):
val = sizersc.wxSizer_InsertSizer(self, *_args, **_kwargs) val = sizersc.wxSizer__SetItemMinSize(self, *_args, **_kwargs)
return val
def InsertSpacer(self, *_args, **_kwargs):
val = sizersc.wxSizer_InsertSpacer(self, *_args, **_kwargs)
return val
def PrependWindow(self, *_args, **_kwargs):
val = sizersc.wxSizer_PrependWindow(self, *_args, **_kwargs)
return val
def PrependSizer(self, *_args, **_kwargs):
val = sizersc.wxSizer_PrependSizer(self, *_args, **_kwargs)
return val
def PrependSpacer(self, *_args, **_kwargs):
val = sizersc.wxSizer_PrependSpacer(self, *_args, **_kwargs)
return val
def RemoveWindow(self, *_args, **_kwargs):
val = sizersc.wxSizer_RemoveWindow(self, *_args, **_kwargs)
return val
def RemoveSizer(self, *_args, **_kwargs):
val = sizersc.wxSizer_RemoveSizer(self, *_args, **_kwargs)
return val
def RemovePos(self, *_args, **_kwargs):
val = sizersc.wxSizer_RemovePos(self, *_args, **_kwargs)
return val return val
def SetDimension(self, *_args, **_kwargs): def SetDimension(self, *_args, **_kwargs):
val = sizersc.wxSizer_SetDimension(self, *_args, **_kwargs) val = sizersc.wxSizer_SetDimension(self, *_args, **_kwargs)
@@ -161,15 +140,6 @@ class wxSizerPtr(wxObjectPtr):
def SetMinSize(self, *_args, **_kwargs): def SetMinSize(self, *_args, **_kwargs):
val = sizersc.wxSizer_SetMinSize(self, *_args, **_kwargs) val = sizersc.wxSizer_SetMinSize(self, *_args, **_kwargs)
return val return val
def SetItemMinSizeWindow(self, *_args, **_kwargs):
val = sizersc.wxSizer_SetItemMinSizeWindow(self, *_args, **_kwargs)
return val
def SetItemMinSizeSizer(self, *_args, **_kwargs):
val = sizersc.wxSizer_SetItemMinSizeSizer(self, *_args, **_kwargs)
return val
def SetItemMinSizePos(self, *_args, **_kwargs):
val = sizersc.wxSizer_SetItemMinSizePos(self, *_args, **_kwargs)
return val
def GetSize(self, *_args, **_kwargs): def GetSize(self, *_args, **_kwargs):
val = sizersc.wxSizer_GetSize(self, *_args, **_kwargs) val = sizersc.wxSizer_GetSize(self, *_args, **_kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1 if val: val = wxSizePtr(val) ; val.thisown = 1
@@ -207,23 +177,14 @@ class wxSizerPtr(wxObjectPtr):
def GetChildren(self, *_args, **_kwargs): def GetChildren(self, *_args, **_kwargs):
val = sizersc.wxSizer_GetChildren(self, *_args, **_kwargs) val = sizersc.wxSizer_GetChildren(self, *_args, **_kwargs)
return val return val
def ShowWindow(self, *_args, **_kwargs): def Show(self, *_args, **_kwargs):
val = sizersc.wxSizer_ShowWindow(self, *_args, **_kwargs) val = sizersc.wxSizer_Show(self, *_args, **_kwargs)
return val return val
def HideWindow(self, *_args, **_kwargs): def Hide(self, *_args, **_kwargs):
val = sizersc.wxSizer_HideWindow(self, *_args, **_kwargs) val = sizersc.wxSizer_Hide(self, *_args, **_kwargs)
return val return val
def ShowSizer(self, *_args, **_kwargs): def IsShown(self, *_args, **_kwargs):
val = sizersc.wxSizer_ShowSizer(self, *_args, **_kwargs) val = sizersc.wxSizer_IsShown(self, *_args, **_kwargs)
return val
def HideSizer(self, *_args, **_kwargs):
val = sizersc.wxSizer_HideSizer(self, *_args, **_kwargs)
return val
def IsShownWindow(self, *_args, **_kwargs):
val = sizersc.wxSizer_IsShownWindow(self, *_args, **_kwargs)
return val
def IsShownSizer(self, *_args, **_kwargs):
val = sizersc.wxSizer_IsShownSizer(self, *_args, **_kwargs)
return val return val
def ShowItems(self, *_args, **_kwargs): def ShowItems(self, *_args, **_kwargs):
val = sizersc.wxSizer_ShowItems(self, *_args, **_kwargs) val = sizersc.wxSizer_ShowItems(self, *_args, **_kwargs)
@@ -231,45 +192,11 @@ class wxSizerPtr(wxObjectPtr):
def __repr__(self): def __repr__(self):
return "<%s.%s instance; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this) return "<%s.%s instance; proxy of C++ wxSizer instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
def Add(self, *args, **kw): def Add(self, item, *args, **kw):
if type(args[0]) == type(1): if type(item) == type(1):
self.AddSpacer(*args, **kw) item = (item, args[0]) # backwards compatibility, args are width, height
elif isinstance(args[0], wxSizerPtr): args = args[1:]
self.AddSizer(*args, **kw) self._Add(item, *args, **kw)
elif isinstance(args[0], wxWindowPtr):
self.AddWindow(*args, **kw)
else:
raise TypeError, 'Expected int, wxSizer or wxWindow parameter'
def Insert(self, *args, **kw):
if type(args[1]) == type(1):
self.InsertSpacer(*args, **kw)
elif isinstance(args[1], wxSizerPtr):
self.InsertSizer(*args, **kw)
elif isinstance(args[1], wxWindowPtr):
self.InsertWindow(*args, **kw)
else:
raise TypeError, 'Expected int, wxSizer or wxWindow parameter'
def Prepend(self, *args, **kw):
if type(args[0]) == type(1):
self.PrependSpacer(*args, **kw)
elif isinstance(args[0], wxSizerPtr):
self.PrependSizer(*args, **kw)
elif isinstance(args[0], wxWindowPtr):
self.PrependWindow(*args, **kw)
else:
raise TypeError, 'Expected int, wxSizer or wxWindow parameter'
def Remove(self, *args, **kw):
if type(args[0]) == type(1):
return self.RemovePos(*args, **kw)
elif isinstance(args[0], wxSizerPtr):
return self.RemoveSizer(*args, **kw)
elif isinstance(args[0], wxWindowPtr):
return self.RemoveWindow(*args, **kw)
else:
raise TypeError, 'Expected int, wxSizer or wxWindow parameter'
def AddMany(self, widgets): def AddMany(self, widgets):
for childinfo in widgets: for childinfo in widgets:
@@ -277,17 +204,33 @@ class wxSizerPtr(wxObjectPtr):
childinfo = (childinfo, ) childinfo = (childinfo, )
self.Add(*childinfo) self.Add(*childinfo)
def Prepend(self, item, *args, **kw):
def SetItemMinSize(self, *args): if type(item) == type(1):
if type(args[0]) == type(1): item = (item, args[0]) # backwards compatibility, args are width, height
self.SetItemMinSizePos(*args) args = args[1:]
elif isinstance(args[0], wxSizerPtr): self._Prepend(item, *args, **kw)
self.SetItemMinSizeSizer(*args)
elif isinstance(args[0], wxWindowPtr): def Insert(self, before, item, *args, **kw):
self.SetItemMinSizeWindow(*args) if type(item) == type(1):
item = (item, args[0]) # backwards compatibility, args are width, height
args = args[1:]
self._Insert(before, item, *args, **kw)
# for backwards compatibility only
AddWindow = AddSizer = AddSpacer = Add
PrependWindow = PrependSizer = PrependSpacer = Prepend
InsertWindow = InsertSizer = InsertSpacer = Insert
RemoveWindow = RemoveSizer = RemovePos = Remove
def SetItemMinSize(self, item, *args):
if len(args) == 2:
return self._SetItemMinSize(item, args)
else: else:
raise TypeError, 'Expected int, wxSizer or wxWindow parameter' return self._SetItemMinSize(item, args[0])
def GetSizeTuple(self): def GetSizeTuple(self):
return self.GetSize().asTuple() return self.GetSize().asTuple()
@@ -296,31 +239,6 @@ class wxSizerPtr(wxObjectPtr):
def GetMinSizeTuple(self): def GetMinSizeTuple(self):
return self.GetMinSize().asTuple() return self.GetMinSize().asTuple()
def Show(self, *args):
if isinstance(args[0], wxSizerPtr):
self.ShowSizer(*args)
elif isinstance(args[0], wxWindowPtr):
self.ShowWindow(*args)
else:
raise TypeError, 'Expected wxSizer or wxWindow parameter'
def Hide(self, *args):
if isinstance(args[0], wxSizerPtr):
self.HideSizer(*args)
elif isinstance(args[0], wxWindowPtr):
self.HideWindow(*args)
else:
raise TypeError, 'Expected wxSizer or wxWindow parameter'
def IsShown(self, *args):
if isinstance(args[0], wxSizerPtr):
return self.IsShownSizer(*args)
elif isinstance(args[0], wxWindowPtr):
return self.IsShownWindow(*args)
else:
raise TypeError, 'Expected wxSizer or wxWindow parameter'
class wxSizer(wxSizerPtr): class wxSizer(wxSizerPtr):
def __init__(self,this): def __init__(self,this):
self.this = this self.this = this

38
wxPython/src/gtk/windows.cpp
View File

@@ -10697,6 +10697,43 @@ static PyObject *_wrap_wxMenuItem_GetMenu(PyObject *self, PyObject *args, PyObje
return _resultobj; return _resultobj;
} }
#define wxMenuItem_SetMenu(_swigobj,_swigarg0) (_swigobj->SetMenu(_swigarg0))
static PyObject *_wrap_wxMenuItem_SetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMenuItem * _arg0;
wxMenu * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","menu", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetMenu",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenuItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetMenu. Expected _wxMenuItem_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenuItem_SetMenu. Expected _wxMenu_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxMenuItem_SetMenu(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxMenuItem_SetId(_swigobj,_swigarg0) (_swigobj->SetId(_swigarg0)) #define wxMenuItem_SetId(_swigobj,_swigarg0) (_swigobj->SetId(_swigarg0))
static PyObject *_wrap_wxMenuItem_SetId(PyObject *self, PyObject *args, PyObject *kwargs) { static PyObject *_wrap_wxMenuItem_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj; PyObject * _resultobj;
@@ -11500,6 +11537,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuItem_SetId", (PyCFunction) _wrap_wxMenuItem_SetId, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_SetId", (PyCFunction) _wrap_wxMenuItem_SetId, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuItem_SetMenu", (PyCFunction) _wrap_wxMenuItem_SetMenu, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuItem_GetMenu", (PyCFunction) _wrap_wxMenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS }, { "wxMenuItem_GetMenu", (PyCFunction) _wrap_wxMenuItem_GetMenu, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS }, { "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS },
{ "wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS }, { "wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS },

3
wxPython/src/gtk/windows.py
View File

@@ -1054,6 +1054,9 @@ class wxMenuItemPtr(wxObjectPtr):
def GetMenu(self, *_args, **_kwargs): def GetMenu(self, *_args, **_kwargs):
val = windowsc.wxMenuItem_GetMenu(self, *_args, **_kwargs) val = windowsc.wxMenuItem_GetMenu(self, *_args, **_kwargs)
return val return val
def SetMenu(self, *_args, **_kwargs):
val = windowsc.wxMenuItem_SetMenu(self, *_args, **_kwargs)
return val
def SetId(self, *_args, **_kwargs): def SetId(self, *_args, **_kwargs):
val = windowsc.wxMenuItem_SetId(self, *_args, **_kwargs) val = windowsc.wxMenuItem_SetId(self, *_args, **_kwargs)
return val return val

2
wxPython/src/gtk/wx.py
View File

@@ -1575,6 +1575,8 @@ wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
# workarounds for bad wxRTTI names # workarounds for bad wxRTTI names
__wxPyPtrTypeMap['wxGauge95'] = 'wxGauge' __wxPyPtrTypeMap['wxGauge95'] = 'wxGauge'
__wxPyPtrTypeMap['wxSlider95'] = 'wxSlider'
__wxPyPtrTypeMap['wxStatusBar95'] = 'wxStatusBar'