Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-19 12:23:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed some (out) typemaps

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-26 15:22:43 +00:00
parent b3894f30e0
commit 3ecece7e04
28 changed files with 252 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/contrib/gizmos/gizmos.i
+5
View File
@@ -172,6 +172,11 @@ enum {
wxEL_ALLOW_DELETE,
};
%typemap(out) wxPyListCtrl*
{ $result = wxPyMake_wxObject((wxObject*)$1, (bool)$owner); }
// This class provides a composite control that lets the
// user easily enter list of strings
MustHaveApp(wxEditableListBox);
wxPython/contrib/gizmos/gtk/gizmos_wrap.cpp
+14 -9
View File
File diff suppressed because one or more lines are too long
wxPython/contrib/gizmos/mac/gizmos_wrap.cpp
+14 -9
View File
File diff suppressed because one or more lines are too long
wxPython/contrib/gizmos/msw/gizmos_wrap.cpp
+14 -9
View File
File diff suppressed because one or more lines are too long
wxPython/distrib/all/do-build-windows
+9 -7
View File
@@ -116,13 +116,14 @@ fi
# $WXDIR/lib/vc_dll/tex2rtf.exe $DOCSRC $DOCDEST -twice -html -macros $DOCINI
echo "Extracting html docs..."
mkdir -p $WXDIR/docs/html/wx
cd $WXDIR/docs/html/wx
rm -rf *
tar xjf $DESTDIR/wxPython-docs-$VERSION.tar.bz2
rm $DESTDIR/wxPython-docs-$VERSION.tar.bz2
unzip wxPython-$VERSION/docs/wx.zip
# echo "Extracting html docs..."
# mkdir -p $WXDIR/docs/html/wx
# cd $WXDIR/docs/html/wx
# rm -rf *
# tar xjf $DESTDIR/wxPython-docs-$VERSION.tar.bz2
# rm $DESTDIR/wxPython-docs-$VERSION.tar.bz2
# unzip wxPython-$VERSION/docs/wx.zip
echo "Building the HTMLHelp file..."
cd $WXDIR/docs/html/wx
@@ -149,6 +150,7 @@ if [ $CHARTYPE = both -o $CHARTYPE = unicode ]; then
b $PYVER r UNICODE=1 USE_SWIG=0
fi
echo "Building the developer package..."
WXWIN=`cygpath -w $WXDIR`
export WXWIN
wxPython/src/_event.i
+5
View File
@@ -842,6 +842,9 @@ enum
class wxMouseEvent : public wxEvent
{
public:
// turn off this typemap
%typemap(out) wxMouseEvent*;
DocCtorStr(
wxMouseEvent(wxEventType mouseType = wxEVT_NULL),
"Constructs a wx.MouseEvent. Valid event types are:
@@ -860,6 +863,8 @@ public:
* wxEVT_MOTION
* wxEVT_MOUSEWHEEL ", "");
// Turn it back on again
%typemap(out) wxMouseEvent* { $result = wxPyMake_wxObject($1, $owner); }
DocDeclStr(
bool , IsButton() const,
wxPython/src/_filesys.i
+6
View File
@@ -144,9 +144,15 @@ public:
class wxFileSystem : public wxObject {
public:
// turn off this typemap
%typemap(out) wxFileSystem*;
wxFileSystem();
~wxFileSystem();
// Turn it back on again
%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, $owner); }
void ChangePathTo(const wxString& location, bool is_dir = false);
wxString GetPath();
wxPython/src/_image.i
+1
View File
@@ -232,6 +232,7 @@ public:
};
class wxImage : public wxObject {
public:
%typemap(out) wxImage*; // turn off this typemap
wxPython/src/_imaglist.i
+6
View File
@@ -43,8 +43,14 @@ MustHaveApp(wxImageList);
// two bitmaps, or an icon.
class wxImageList : public wxObject {
public:
// turn off this typemap
%typemap(out) wxImageList*;
wxImageList(int width, int height, int mask=true, int initialCount=1);
~wxImageList();
// Turn it back on again
%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, $owner); }
int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap);
%Rename(AddWithColourMask,int, Add(const wxBitmap& bitmap, const wxColour& maskColour));
wxPython/src/_listctrl.i
+11
View File
@@ -192,9 +192,15 @@ public:
// wxListItem: the item or column info, used to exchange data with wxListCtrl
class wxListItem : public wxObject {
public:
// turn off this typemap
%typemap(out) wxListItem*;
wxListItem();
~wxListItem();
// Turn it back on again
%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, $owner); }
// resetting
void Clear();
void ClearAttributes();
@@ -455,6 +461,8 @@ MustHaveApp(wxPyListCtrl);
%rename(ListCtrl) wxPyListCtrl;
class wxPyListCtrl : public wxControl {
public:
// turn off this typemap
%typemap(out) wxPyListCtrl*;
%pythonAppend wxPyListCtrl "self._setOORInfo(self);self._setCallbackInfo(self, ListCtrl)"
%pythonAppend wxPyListCtrl() ""
@@ -467,6 +475,9 @@ public:
const wxString& name = wxPyListCtrlNameStr);
%RenameCtor(PreListCtrl, wxPyListCtrl());
// Turn it back on again
%typemap(out) wxPyListCtrl* { $result = wxPyMake_wxObject($1, $owner); }
bool Create(wxWindow* parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
wxPython/src/_menu.i
+7
View File
@@ -366,6 +366,9 @@ public:
class wxMenuItem : public wxObject {
public:
// turn off this typemap
%typemap(out) wxMenuItem*;
wxMenuItem(wxMenu* parentMenu=NULL, int id=wxID_ANY,
const wxString& text = wxPyEmptyString,
const wxString& help = wxPyEmptyString,
@@ -373,6 +376,10 @@ public:
wxMenu* subMenu = NULL);
~wxMenuItem();
// Turn it back on again
%typemap(out) wxEvtHandler* { $result = wxPyMake_wxObject($1, $owner); }
// the menu we're in
wxMenu *GetMenu() const;
void SetMenu(wxMenu* menu);
wxPython/src/_misc.i
+2 -1
View File
@@ -140,7 +140,8 @@ class wxStopWatch
public:
// ctor starts the stop watch
wxStopWatch();
~wxStopWatch();
// start the stop watch at the moment t0
void Start(long t0 = 0);
wxPython/src/gtk/_controls_wrap.cpp
+16 -10
View File
@@ -19498,7 +19498,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -26516,9 +26518,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -28389,7 +28389,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self),
arg1 = reinterpret_cast< wxListEvent * >(argp1);
result = (wxListItem *)& ((arg1)->m_item);
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29144,7 +29144,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29424,7 +29424,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -30498,7 +30498,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34282,7 +34284,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34310,7 +34314,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
wxPython/src/gtk/_core_wrap.cpp
+3 -9
View File
@@ -10866,9 +10866,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -20677,9 +20675,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -43590,9 +43586,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 );
{
if (temp3)
delete arg3;
wxPython/src/gtk/_misc.py
+2
View File
@@ -941,6 +941,8 @@ class StopWatch(object):
def __init__(self, *args, **kwargs):
"""__init__(self) -> StopWatch"""
_misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))
__swig_destroy__ = _misc_.delete_StopWatch
__del__ = lambda self : None;
def Start(*args, **kwargs):
"""Start(self, long t0=0)"""
return _misc_.StopWatch_Start(*args, **kwargs)
wxPython/src/gtk/_misc_wrap.cpp
+29
View File
@@ -9281,6 +9281,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'");
}
arg1 = reinterpret_cast< wxStopWatch * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
@@ -39159,6 +39187,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL},
{ (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL},
{ (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL},
{ (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL},
{ (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL},
{ (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL},
wxPython/src/gtk/html_wrap.cpp
+2 -2
View File
@@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self),
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
wxPython/src/mac/_controls_wrap.cpp
+16 -10
View File
@@ -19423,7 +19423,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -26441,9 +26443,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -28314,7 +28314,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self),
arg1 = reinterpret_cast< wxListEvent * >(argp1);
result = (wxListItem *)& ((arg1)->m_item);
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29069,7 +29069,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29349,7 +29349,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -30423,7 +30423,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34207,7 +34209,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34235,7 +34239,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
wxPython/src/mac/_core_wrap.cpp
+3 -9
View File
@@ -10865,9 +10865,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -20676,9 +20674,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -43589,9 +43585,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 );
{
if (temp3)
delete arg3;
wxPython/src/mac/_misc.py
+2
View File
@@ -941,6 +941,8 @@ class StopWatch(object):
def __init__(self, *args, **kwargs):
"""__init__(self) -> StopWatch"""
_misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))
__swig_destroy__ = _misc_.delete_StopWatch
__del__ = lambda self : None;
def Start(*args, **kwargs):
"""Start(self, long t0=0)"""
return _misc_.StopWatch_Start(*args, **kwargs)
wxPython/src/mac/_misc_wrap.cpp
+29
View File
@@ -9273,6 +9273,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'");
}
arg1 = reinterpret_cast< wxStopWatch * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
@@ -39220,6 +39248,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL},
{ (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL},
{ (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL},
{ (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL},
{ (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL},
{ (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL},
wxPython/src/mac/html_wrap.cpp
+2 -2
View File
@@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self),
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
wxPython/src/msw/_controls_wrap.cpp
+16 -10
View File
@@ -19571,7 +19571,9 @@ SWIGINTERN PyObject *_wrap_BookCtrlBase_GetImageList(PyObject *SWIGUNUSEDPARM(se
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -26589,9 +26591,7 @@ SWIGINTERN PyObject *_wrap_new_ListItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxListItem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -28462,7 +28462,7 @@ SWIGINTERN PyObject *_wrap_ListEvent_m_item_get(PyObject *SWIGUNUSEDPARM(self),
arg1 = reinterpret_cast< wxListEvent * >(argp1);
result = (wxListItem *)& ((arg1)->m_item);
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29217,7 +29217,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetColumn(PyObject *SWIGUNUSEDPARM(self), Py
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -29497,7 +29497,7 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetItem(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -30522,7 +30522,9 @@ SWIGINTERN PyObject *_wrap_ListCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34350,7 +34352,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetImageList(PyObject *SWIGUNUSEDPARM(self),
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
@@ -34378,7 +34382,9 @@ SWIGINTERN PyObject *_wrap_TreeCtrl_GetStateImageList(PyObject *SWIGUNUSEDPARM(s
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxImageList, 0 | 0 );
{
resultobj = wxPyMake_wxObject(result, (bool)0);
}
return resultobj;
fail:
return NULL;
wxPython/src/msw/_core_wrap.cpp
+3 -9
View File
@@ -10850,9 +10850,7 @@ SWIGINTERN PyObject *_wrap_new_FileSystem(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystem, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -20661,9 +20659,7 @@ SWIGINTERN PyObject *_wrap_new_MouseEvent(PyObject *SWIGUNUSEDPARM(self), PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMouseEvent, SWIG_POINTER_NEW | 0 );
return resultobj;
fail:
return NULL;
@@ -43615,9 +43611,7 @@ SWIGINTERN PyObject *_wrap_new_MenuItem(PyObject *SWIGUNUSEDPARM(self), PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)SWIG_POINTER_NEW);
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxMenuItem, SWIG_POINTER_NEW | 0 );
{
if (temp3)
delete arg3;
wxPython/src/msw/_misc.py
+2
View File
@@ -941,6 +941,8 @@ class StopWatch(object):
def __init__(self, *args, **kwargs):
"""__init__(self) -> StopWatch"""
_misc_.StopWatch_swiginit(self,_misc_.new_StopWatch(*args, **kwargs))
__swig_destroy__ = _misc_.delete_StopWatch
__del__ = lambda self : None;
def Start(*args, **kwargs):
"""Start(self, long t0=0)"""
return _misc_.StopWatch_Start(*args, **kwargs)
wxPython/src/msw/_misc_wrap.cpp
+29
View File
@@ -9273,6 +9273,34 @@ fail:
}
SWIGINTERN PyObject *_wrap_delete_StopWatch(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject *swig_obj[1] ;
if (!args) SWIG_fail;
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxStopWatch, SWIG_POINTER_DISOWN | 0 );
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_StopWatch" "', expected argument " "1"" of type '" "wxStopWatch *""'");
}
arg1 = reinterpret_cast< wxStopWatch * >(argp1);
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_Py_Void();
return resultobj;
fail:
return NULL;
}
SWIGINTERN PyObject *_wrap_StopWatch_Start(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
PyObject *resultobj = 0;
wxStopWatch *arg1 = (wxStopWatch *) 0 ;
@@ -39220,6 +39248,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"BusyInfo_swigregister", BusyInfo_swigregister, METH_VARARGS, NULL},
{ (char *)"BusyInfo_swiginit", BusyInfo_swiginit, METH_VARARGS, NULL},
{ (char *)"new_StopWatch", (PyCFunction)_wrap_new_StopWatch, METH_NOARGS, NULL},
{ (char *)"delete_StopWatch", (PyCFunction)_wrap_delete_StopWatch, METH_O, NULL},
{ (char *)"StopWatch_Start", (PyCFunction) _wrap_StopWatch_Start, METH_VARARGS | METH_KEYWORDS, NULL},
{ (char *)"StopWatch_Pause", (PyCFunction)_wrap_StopWatch_Pause, METH_O, NULL},
{ (char *)"StopWatch_Resume", (PyCFunction)_wrap_StopWatch_Resume, METH_O, NULL},
wxPython/src/msw/html_wrap.cpp
+2 -2
View File
@@ -3407,7 +3407,7 @@ SWIGINTERN PyObject *_wrap_HtmlLinkInfo_GetEvent(PyObject *SWIGUNUSEDPARM(self),
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
@@ -3890,7 +3890,7 @@ SWIGINTERN PyObject *_wrap_HtmlParser_GetFS(PyObject *SWIGUNUSEDPARM(self), PyOb
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, (bool)0);
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
wxPython/src/my_typemaps.i
+2 -3
View File
@@ -370,7 +370,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
%typemap(out) wxDC* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxFSFile* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxFileSystem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
//%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxImageList* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxImage* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxListItem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxMenuItem* { $result = wxPyMake_wxObject($1, (bool)$owner); }
@@ -386,7 +386,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
%typemap(out) wxControl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxGrid* { $result = wxPyMake_wxObject($1, (bool)$owner); }
//%typemap(out) wxListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxPyListCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxMDIChildFrame* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxMDIClientWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxMenuBar* { $result = wxPyMake_wxObject($1, (bool)$owner); }
@@ -396,7 +396,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
%typemap(out) wxTextCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxToolBar* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxToolBarBase* { $result = wxPyMake_wxObject($1, (bool)$owner); }
//%typemap(out) wxTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxPyTreeCtrl* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }
%typemap(out) wxPyHtmlWindow* { $result = wxPyMake_wxObject($1, (bool)$owner); }