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

Regenerated SWIGged sources for wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-01-16 01:03:43 +00:00
parent 6556acfa56
commit db34b2d45d
13 changed files with 2076 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/stc/gtk/stc_.cpp
View File

@@ -11328,7 +11328,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_STRING", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_ENVIRONMENT", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_NNCRONTAB_IDENTIFIER", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31)))));
PyDict_SetItemString(d,"wxSTC_MASK_FOLDERS", PyInt_FromLong((long) ((1<<(30))|(1<<(31))|(1<<(29))|(1<<(28))|(1<<(27))|(1<<(26))|(1<<(25)))));
PyDict_SetItemString(d,"wxSTCNameStr", PyString_FromString("wxSTCNameStr"));
PyDict_SetItemString(d,"wxEVT_STC_CHANGE", PyInt_FromLong((long) wxEVT_STC_CHANGE));
PyDict_SetItemString(d,"wxEVT_STC_STYLENEEDED", PyInt_FromLong((long) wxEVT_STC_STYLENEEDED));

43
wxPython/src/gtk/controls.cpp
View File

@@ -74,7 +74,6 @@ extern PyObject *SWIG_newvarlink(void);
#endif
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
@@ -6563,6 +6562,41 @@ static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
#define wxTextCtrl_GetRange(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetRange(_swigarg0,_swigarg1))
static PyObject *_wrap_wxTextCtrl_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxTextCtrl * _arg0;
long _arg1;
long _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","from","to", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_GetRange",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTextCtrl_GetRange. Expected _wxTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxTextCtrl_GetRange(_arg0,_arg1,_arg2));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
}
{
delete _result;
}
return _resultobj;
}
#define wxTextCtrl_GetLineLength(_swigobj,_swigarg0) (_swigobj->GetLineLength(_swigarg0))
static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -7314,7 +7348,6 @@ static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args, P
#define wxTextCtrl_PositionToXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PositionToXY(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxTextCtrl * _arg0;
long _arg1;
long * _arg2;
@@ -7342,11 +7375,12 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxTextCtrl_PositionToXY(_arg0,_arg1,_arg2,_arg3);
wxTextCtrl_PositionToXY(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
@@ -11556,6 +11590,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxTextCtrl_GetNumberOfLines", (PyCFunction) _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetLineText", (PyCFunction) _wrap_wxTextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetLineLength", (PyCFunction) _wrap_wxTextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetRange", (PyCFunction) _wrap_wxTextCtrl_GetRange, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_SetValue", (PyCFunction) _wrap_wxTextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_GetValue", (PyCFunction) _wrap_wxTextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
{ "wxTextCtrl_Create", (PyCFunction) _wrap_wxTextCtrl_Create, METH_VARARGS | METH_KEYWORDS },

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

@@ -643,6 +643,9 @@ class wxTextCtrlPtr(wxControlPtr):
def SetValue(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_SetValue,(self,) + _args, _kwargs)
return val
def GetRange(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_GetRange,(self,) + _args, _kwargs)
return val
def GetLineLength(self, *_args, **_kwargs):
val = apply(controlsc.wxTextCtrl_GetLineLength,(self,) + _args, _kwargs)
return val

1649
wxPython/src/gtk/controls2.cpp
View File

File diff suppressed because it is too large Load Diff

149
wxPython/src/gtk/controls2.py
View File

@@ -1101,6 +1101,151 @@ def wxPreTreeCtrl(*_args,**_kwargs):
return val
class wxDirItemDataPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def SetNewDirName(self, *_args, **_kwargs):
val = apply(controls2c.wxDirItemData_SetNewDirName,(self,) + _args, _kwargs)
return val
def __setattr__(self,name,value):
if name == "m_path" :
controls2c.wxDirItemData_m_path_set(self,value)
return
if name == "m_name" :
controls2c.wxDirItemData_m_name_set(self,value)
return
if name == "m_isHidden" :
controls2c.wxDirItemData_m_isHidden_set(self,value)
return
if name == "m_isExpanded" :
controls2c.wxDirItemData_m_isExpanded_set(self,value)
return
if name == "m_isDir" :
controls2c.wxDirItemData_m_isDir_set(self,value)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_path" :
return controls2c.wxDirItemData_m_path_get(self)
if name == "m_name" :
return controls2c.wxDirItemData_m_name_get(self)
if name == "m_isHidden" :
return controls2c.wxDirItemData_m_isHidden_get(self)
if name == "m_isExpanded" :
return controls2c.wxDirItemData_m_isExpanded_get(self)
if name == "m_isDir" :
return controls2c.wxDirItemData_m_isDir_get(self)
raise AttributeError,name
def __repr__(self):
return "<C wxDirItemData instance at %s>" % (self.this,)
class wxDirItemData(wxDirItemDataPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxDirItemData,_args,_kwargs)
self.thisown = 1
class wxGenericDirCtrlPtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_Create,(self,) + _args, _kwargs)
return val
def ExpandPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_ExpandPath,(self,) + _args, _kwargs)
return val
def GetDefaultPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetDefaultPath,(self,) + _args, _kwargs)
return val
def SetDefaultPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetDefaultPath,(self,) + _args, _kwargs)
return val
def GetPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetPath,(self,) + _args, _kwargs)
return val
def GetFilePath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilePath,(self,) + _args, _kwargs)
return val
def SetPath(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetPath,(self,) + _args, _kwargs)
return val
def ShowHidden(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_ShowHidden,(self,) + _args, _kwargs)
return val
def GetShowHidden(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetShowHidden,(self,) + _args, _kwargs)
return val
def GetFilter(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilter,(self,) + _args, _kwargs)
return val
def SetFilter(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetFilter,(self,) + _args, _kwargs)
return val
def GetFilterIndex(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilterIndex,(self,) + _args, _kwargs)
return val
def SetFilterIndex(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_SetFilterIndex,(self,) + _args, _kwargs)
return val
def GetRootId(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetRootId,(self,) + _args, _kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
def GetTreeCtrl(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetTreeCtrl,(self,) + _args, _kwargs)
if val: val = wxTreeCtrlPtr(val)
return val
def GetFilterListCtrl(self, *_args, **_kwargs):
val = apply(controls2c.wxGenericDirCtrl_GetFilterListCtrl,(self,) + _args, _kwargs)
if val: val = wxDirFilterListCtrlPtr(val)
return val
def __repr__(self):
return "<C wxGenericDirCtrl instance at %s>" % (self.this,)
class wxGenericDirCtrl(wxGenericDirCtrlPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxGenericDirCtrl,_args,_kwargs)
self.thisown = 1
self._setOORInfo(self)
def wxPreGenericDirCtrl(*_args,**_kwargs):
val = wxGenericDirCtrlPtr(apply(controls2c.new_wxPreGenericDirCtrl,_args,_kwargs))
val.thisown = 1
val._setOORInfo(val)
return val
class wxDirFilterListCtrlPtr(wxChoicePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def Create(self, *_args, **_kwargs):
val = apply(controls2c.wxDirFilterListCtrl_Create,(self,) + _args, _kwargs)
return val
def FillFilterList(self, *_args, **_kwargs):
val = apply(controls2c.wxDirFilterListCtrl_FillFilterList,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDirFilterListCtrl instance at %s>" % (self.this,)
class wxDirFilterListCtrl(wxDirFilterListCtrlPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controls2c.new_wxDirFilterListCtrl,_args,_kwargs)
self.thisown = 1
self._setOORInfo(self)
def wxPreDirFilterListCtrl(*_args,**_kwargs):
val = wxDirFilterListCtrlPtr(apply(controls2c.new_wxPreDirFilterListCtrl,_args,_kwargs))
val.thisown = 1
val._setOORInfo(val)
return val
#-------------- FUNCTION WRAPPERS ------------------
@@ -1248,3 +1393,7 @@ wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED
wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK
wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
wxEVT_COMMAND_TREE_END_DRAG = controls2c.wxEVT_COMMAND_TREE_END_DRAG
wxDIRCTRL_DIR_ONLY = controls2c.wxDIRCTRL_DIR_ONLY
wxDIRCTRL_SELECT_FIRST = controls2c.wxDIRCTRL_SELECT_FIRST
wxDIRCTRL_SHOW_FILTERS = controls2c.wxDIRCTRL_SHOW_FILTERS
wxDIRCTRL_3D_INTERNAL = controls2c.wxDIRCTRL_3D_INTERNAL

29
wxPython/src/gtk/gdi.cpp
View File

@@ -3715,6 +3715,34 @@ static PyObject *_wrap_wxFont_GetEncoding(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
#define wxFont_IsFixedWidth(_swigobj) (_swigobj->IsFixedWidth())
static PyObject *_wrap_wxFont_IsFixedWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxFont * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFont_IsFixedWidth",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFont_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFont_IsFixedWidth. Expected _wxFont_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxFont_IsFixedWidth(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxFont_GetNativeFontInfo(_swigobj) (_swigobj->GetNativeFontInfo())
static PyObject *_wrap_wxFont_GetNativeFontInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -11632,6 +11660,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxFont_GetNativeFontInfoUserDesc", (PyCFunction) _wrap_wxFont_GetNativeFontInfoUserDesc, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetNativeFontInfoDesc", (PyCFunction) _wrap_wxFont_GetNativeFontInfoDesc, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetNativeFontInfo", (PyCFunction) _wrap_wxFont_GetNativeFontInfo, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_IsFixedWidth", (PyCFunction) _wrap_wxFont_IsFixedWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetEncoding", (PyCFunction) _wrap_wxFont_GetEncoding, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetFaceName", (PyCFunction) _wrap_wxFont_GetFaceName, METH_VARARGS | METH_KEYWORDS },
{ "wxFont_GetUnderlined", (PyCFunction) _wrap_wxFont_GetUnderlined, METH_VARARGS | METH_KEYWORDS },

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

@@ -293,6 +293,9 @@ class wxFontPtr(wxGDIObjectPtr):
def GetEncoding(self, *_args, **_kwargs):
val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
return val
def IsFixedWidth(self, *_args, **_kwargs):
val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)
return val
def GetNativeFontInfo(self, *_args, **_kwargs):
val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
if val: val = wxNativeFontInfoPtr(val)

135
wxPython/src/gtk/image.cpp
View File

@@ -916,6 +916,130 @@ static PyObject *_wrap_new_wxICOHandler(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxCURHandlerTowxICOHandler(void *ptr) {
wxCURHandler *src;
wxICOHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxICOHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxBMPHandler(void *ptr) {
wxCURHandler *src;
wxBMPHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxBMPHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxImageHandler(void *ptr) {
wxCURHandler *src;
wxImageHandler *dest;
src = (wxCURHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
static void *SwigwxCURHandlerTowxObject(void *ptr) {
wxCURHandler *src;
wxObject *dest;
src = (wxCURHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxCURHandler() (new wxCURHandler())
static PyObject *_wrap_new_wxCURHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxCURHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxCURHandler",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxCURHandler *)new_wxCURHandler();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxCURHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxANIHandlerTowxCURHandler(void *ptr) {
wxANIHandler *src;
wxCURHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxCURHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxICOHandler(void *ptr) {
wxANIHandler *src;
wxICOHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxICOHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxBMPHandler(void *ptr) {
wxANIHandler *src;
wxBMPHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxBMPHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxImageHandler(void *ptr) {
wxANIHandler *src;
wxImageHandler *dest;
src = (wxANIHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
static void *SwigwxANIHandlerTowxObject(void *ptr) {
wxANIHandler *src;
wxObject *dest;
src = (wxANIHandler *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxANIHandler() (new wxANIHandler())
static PyObject *_wrap_new_wxANIHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxANIHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxANIHandler",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxANIHandler *)new_wxANIHandler();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxANIHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxGIFHandlerTowxImageHandler(void *ptr) {
wxGIFHandler *src;
wxImageHandler *dest;
@@ -2925,6 +3049,8 @@ static PyMethodDef imagecMethods[] = {
{ "new_wxPCXHandler", (PyCFunction) _wrap_new_wxPCXHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPNMHandler", (PyCFunction) _wrap_new_wxPNMHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxANIHandler", (PyCFunction) _wrap_new_wxANIHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxCURHandler", (PyCFunction) _wrap_new_wxCURHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxICOHandler", (PyCFunction) _wrap_new_wxICOHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxBMPHandler", (PyCFunction) _wrap_new_wxBMPHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxJPEGHandler", (PyCFunction) _wrap_new_wxJPEGHandler, METH_VARARGS | METH_KEYWORDS },
@@ -2954,7 +3080,11 @@ static PyMethodDef imagecMethods[] = {
*/
static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_signed_long","_long",0},
{ "_wxBMPHandler","_wxANIHandler",SwigwxANIHandlerTowxBMPHandler},
{ "_wxBMPHandler","_wxCURHandler",SwigwxCURHandlerTowxBMPHandler},
{ "_wxBMPHandler","_wxICOHandler",SwigwxICOHandlerTowxBMPHandler},
{ "_wxICOHandler","_wxANIHandler",SwigwxANIHandlerTowxICOHandler},
{ "_wxICOHandler","_wxCURHandler",SwigwxCURHandlerTowxICOHandler},
{ "_wxPrintQuality","_wxCoord",0},
{ "_wxPrintQuality","_int",0},
{ "_wxPrintQuality","_signed_int",0},
@@ -2968,6 +3098,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
{ "_wxImageHandler","_wxGIFHandler",SwigwxGIFHandlerTowxImageHandler},
{ "_wxImageHandler","_wxANIHandler",SwigwxANIHandlerTowxImageHandler},
{ "_wxImageHandler","_wxCURHandler",SwigwxCURHandlerTowxImageHandler},
{ "_wxImageHandler","_wxICOHandler",SwigwxICOHandlerTowxImageHandler},
{ "_wxImageHandler","_wxBMPHandler",SwigwxBMPHandlerTowxImageHandler},
{ "_wxImageHandler","_wxJPEGHandler",SwigwxJPEGHandlerTowxImageHandler},
@@ -3014,6 +3146,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxPCXHandler",SwigwxPCXHandlerTowxObject},
{ "_wxObject","_wxPNMHandler",SwigwxPNMHandlerTowxObject},
{ "_wxObject","_wxGIFHandler",SwigwxGIFHandlerTowxObject},
{ "_wxObject","_wxANIHandler",SwigwxANIHandlerTowxObject},
{ "_wxObject","_wxCURHandler",SwigwxCURHandlerTowxObject},
{ "_wxObject","_wxICOHandler",SwigwxICOHandlerTowxObject},
{ "_wxObject","_wxBMPHandler",SwigwxBMPHandlerTowxObject},
{ "_wxObject","_wxJPEGHandler",SwigwxJPEGHandlerTowxObject},
@@ -3021,6 +3155,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxImageHandler",SwigwxImageHandlerTowxObject},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxCURHandler","_wxANIHandler",SwigwxANIHandlerTowxCURHandler},
{ "_unsigned_char","_byte",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},

28
wxPython/src/gtk/image.py
View File

@@ -100,6 +100,34 @@ class wxICOHandler(wxICOHandlerPtr):
class wxCURHandlerPtr(wxICOHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxCURHandler instance at %s>" % (self.this,)
class wxCURHandler(wxCURHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxCURHandler,_args,_kwargs)
self.thisown = 1
class wxANIHandlerPtr(wxCURHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxANIHandler instance at %s>" % (self.this,)
class wxANIHandler(wxANIHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxANIHandler,_args,_kwargs)
self.thisown = 1
class wxGIFHandlerPtr(wxImageHandlerPtr):
def __init__(self,this):
self.this = this

93
wxPython/src/gtk/misc2.cpp
View File

@@ -2299,67 +2299,6 @@ static PyObject *_wrap_wxSystemSettings_HasFeature(PyObject *self, PyObject *arg
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxColour * _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemColour",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxColour (wxSystemSettings::GetColour(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxFont * _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemFont",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxFont (wxSystemSettings::GetFont(_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
int _arg0;
char *_kwnames[] = { "index", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemMetric",_kwnames,&_arg0))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSystemSettings::GetMetric(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxToolTipTowxObject(void *ptr) {
wxToolTip *src;
wxObject *dest;
@@ -4489,6 +4428,34 @@ static PyObject *_wrap_new_wxStopWatch(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
#define delete_wxStopWatch(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxStopWatch(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStopWatch * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxStopWatch",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStopWatch_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxStopWatch. Expected _wxStopWatch_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxStopWatch(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxStopWatch_Start(_swigobj,_swigarg0) (_swigobj->Start(_swigarg0))
static PyObject *_wrap_wxStopWatch_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -10323,6 +10290,7 @@ static PyMethodDef misc2cMethods[] = {
{ "wxStopWatch_Resume", (PyCFunction) _wrap_wxStopWatch_Resume, METH_VARARGS | METH_KEYWORDS },
{ "wxStopWatch_Pause", (PyCFunction) _wrap_wxStopWatch_Pause, METH_VARARGS | METH_KEYWORDS },
{ "wxStopWatch_Start", (PyCFunction) _wrap_wxStopWatch_Start, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxStopWatch", (PyCFunction) _wrap_delete_wxStopWatch, METH_VARARGS | METH_KEYWORDS },
{ "new_wxStopWatch", (PyCFunction) _wrap_new_wxStopWatch, METH_VARARGS | METH_KEYWORDS },
{ "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS },
{ "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS },
@@ -10385,9 +10353,6 @@ static PyMethodDef misc2cMethods[] = {
{ "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
{ "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
{ "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemMetric", (PyCFunction) _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemFont", (PyCFunction) _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetSystemColour", (PyCFunction) _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_HasFeature", (PyCFunction) _wrap_wxSystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetMetric", (PyCFunction) _wrap_wxSystemSettings_GetMetric, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetFont", (PyCFunction) _wrap_wxSystemSettings_GetFont, METH_VARARGS | METH_KEYWORDS },

15
wxPython/src/gtk/misc2.py
View File

@@ -332,6 +332,9 @@ class wxStopWatchPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,misc2c=misc2c):
if self.thisown == 1 :
misc2c.delete_wxStopWatch(self)
def Start(self, *_args, **_kwargs):
val = apply(misc2c.wxStopWatch_Start,(self,) + _args, _kwargs)
return val
@@ -1145,18 +1148,6 @@ wxSystemSettings_GetMetric = misc2c.wxSystemSettings_GetMetric
wxSystemSettings_HasFeature = misc2c.wxSystemSettings_HasFeature
def wxSystemSettings_GetSystemColour(*_args, **_kwargs):
val = apply(misc2c.wxSystemSettings_GetSystemColour,_args,_kwargs)
if val: val = wxColourPtr(val); val.thisown = 1
return val
def wxSystemSettings_GetSystemFont(*_args, **_kwargs):
val = apply(misc2c.wxSystemSettings_GetSystemFont,_args,_kwargs)
if val: val = wxFontPtr(val); val.thisown = 1
return val
wxSystemSettings_GetSystemMetric = misc2c.wxSystemSettings_GetSystemMetric
wxToolTip_Enable = misc2c.wxToolTip_Enable
wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay

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

@@ -1954,6 +1954,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE));
PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_RICH2", PyInt_FromLong((long) wxTE_RICH2));
PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER));
@@ -2346,6 +2347,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxBITMAP_TYPE_PICT_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_PICT_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON", PyInt_FromLong((long) wxBITMAP_TYPE_ICON));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ICON_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_ICON_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ANI", PyInt_FromLong((long) wxBITMAP_TYPE_ANI));
PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR));
PyDict_SetItemString(d,"wxBITMAP_TYPE_MACCURSOR_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_MACCURSOR_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY));

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

@@ -243,6 +243,7 @@ wxTE_READONLY = wxc.wxTE_READONLY
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
wxTE_RICH = wxc.wxTE_RICH
wxTE_RICH2 = wxc.wxTE_RICH2
wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
@@ -635,6 +636,7 @@ wxBITMAP_TYPE_PICT = wxc.wxBITMAP_TYPE_PICT
wxBITMAP_TYPE_PICT_RESOURCE = wxc.wxBITMAP_TYPE_PICT_RESOURCE
wxBITMAP_TYPE_ICON = wxc.wxBITMAP_TYPE_ICON
wxBITMAP_TYPE_ICON_RESOURCE = wxc.wxBITMAP_TYPE_ICON_RESOURCE
wxBITMAP_TYPE_ANI = wxc.wxBITMAP_TYPE_ANI
wxBITMAP_TYPE_MACCURSOR = wxc.wxBITMAP_TYPE_MACCURSOR
wxBITMAP_TYPE_MACCURSOR_RESOURCE = wxc.wxBITMAP_TYPE_MACCURSOR_RESOURCE
wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
@@ -1439,12 +1441,6 @@ class wxTimer(wxPyTimer):
wxPyTimer.__init__(self, None)
self.SetOwner(evtHandler, id)
#----------------------------------------------------------------------
NULL = None # For backwards compatibility only. You should really be
# using None now.
#----------------------------------------------------------------------
# aliases
@@ -1456,7 +1452,10 @@ wxPen = wxPyPen
wxNoRefBitmap = wxBitmap
wxPyDefaultPosition = wxDefaultPosition
wxPyDefaultSize = wxDefaultSize
NULL = None
wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
wxSystemSettings_GetSystemFont = wxSystemSettings_GetFont
wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
#----------------------------------------------------------------------
# wxGTK sets the locale when initialized. Doing this at the Python