Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17359/wxLua/bindings/wxwidgets
Modified Files:
defsutil.i
Log Message:
use wxMemorySize in >2.6 in defsutils.i
fix removing callbacks (segfault on exit)
Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** defsutil.i 24 Nov 2005 06:38:17 -0000 1.6
--- defsutil.i 28 Nov 2005 01:28:54 -0000 1.7
***************
*** 40,44 ****
wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
//wxProcess(int flags)
!
//static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN)
static bool Exists(int pid)
--- 40,44 ----
wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
//wxProcess(int flags)
!
//static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN)
static bool Exists(int pid)
***************
*** 48,52 ****
bool IsRedirected()
void Detach()
!
%if wxUSE_STREAMS
wxInputStream *GetInputStream() const
--- 48,52 ----
bool IsRedirected()
void Detach()
!
%if wxUSE_STREAMS
wxInputStream *GetInputStream() const
***************
*** 59,63 ****
void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream)
%endif // wxUSE_STREAMS
!
%endclass
--- 59,63 ----
void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream)
%endif // wxUSE_STREAMS
!
%endclass
***************
*** 75,79 ****
// Network, user, and OS functions
! %builtin long wxGetFreeMemory()
%builtin wxString wxGetFullHostName()
//%builtin bool wxGetEmailAddress(const wxString& buf, int sz)
--- 75,80 ----
// Network, user, and OS functions
! !%wxchkver27 %builtin long wxGetFreeMemory()
! %wxchkver27 %builtin wxMemorySize wxGetFreeMemory()
%builtin wxString wxGetFullHostName()
//%builtin bool wxGetEmailAddress(const wxString& buf, int sz)
|
