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

Add OOR support for wxApp objects too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-02-18 00:25:01 +00:00
parent e6881a71e5
commit 581b33ff45
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wxPython/CHANGES.txt
View File

@@ -6,6 +6,7 @@ CHANGES.txt for wxPython
------- -------
Added missing wxRect methods Added missing wxRect methods
Add OOR support for wxApp objects too.

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

@@ -909,7 +909,6 @@ static PyObject *_wrap_wxGetApp(PyObject *self, PyObject *args, PyObject *kwargs
PyObject * _resultobj; PyObject * _resultobj;
wxPyApp * _result; wxPyApp * _result;
char *_kwnames[] = { NULL }; char *_kwnames[] = { NULL };
char _ptemp[128];
self = self; self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetApp",_kwnames)) if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetApp",_kwnames))
@@ -920,13 +919,7 @@ static PyObject *_wrap_wxGetApp(PyObject *self, PyObject *args, PyObject *kwargs
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
} if (_result) { }{ _resultobj = wxPyMake_wxObject(_result); }
SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyApp_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj; return _resultobj;
} }

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

@@ -157,7 +157,6 @@ _wxSetDictionary = wxc._wxSetDictionary
def wxGetApp(*_args, **_kwargs): def wxGetApp(*_args, **_kwargs):
val = apply(wxc.wxGetApp,_args,_kwargs) val = apply(wxc.wxGetApp,_args,_kwargs)
if val: val = wxPyAppPtr(val)
return val return val
wxApp_CleanUp = wxc.wxApp_CleanUp wxApp_CleanUp = wxc.wxApp_CleanUp

2
wxPython/src/my_typemaps.i
View File

@@ -402,6 +402,8 @@ $function
%typemap(python, out) wxMenu* { $target = wxPyMake_wxObject($source); } %typemap(python, out) wxMenu* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxValidator* { $target = wxPyMake_wxObject($source); } %typemap(python, out) wxValidator* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxApp* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxPyApp* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxDC* { $target = wxPyMake_wxObject($source); } %typemap(python, out) wxDC* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxFSFile* { $target = wxPyMake_wxObject($source); } %typemap(python, out) wxFSFile* { $target = wxPyMake_wxObject($source); }
%typemap(python, out) wxFileSystem* { $target = wxPyMake_wxObject($source); } %typemap(python, out) wxFileSystem* { $target = wxPyMake_wxObject($source); }