Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19201/wxLua/bindings/wxwidgets
Modified Files:
wave.i windows.i
Log Message:
update to more depricated wx27 stuff
Index: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** windows.i 20 Nov 2005 04:09:46 -0000 1.5
--- windows.i 21 Nov 2005 23:42:59 -0000 1.6
***************
*** 216,225 ****
%define wxNB_FIXEDWIDTH
- %wxchkver23 %define wxNB_TOP
- %define wxNB_LEFT
- %define wxNB_RIGHT
- %define wxNB_BOTTOM
%wxchkver23 %define wxNB_MULTILINE
%typedef wxNotebookPage wxWindow
--- 216,231 ----
%define wxNB_FIXEDWIDTH
%wxchkver23 %define wxNB_MULTILINE
+ %wxchkver23&(!%wxchkver27|%wxcompat26) %define wxNB_TOP
+ !%wxchkver27|%wxcompat26 %define wxNB_LEFT
+ !%wxchkver27|%wxcompat26 %define wxNB_RIGHT
+ !%wxchkver27|%wxcompat26 %define wxNB_BOTTOM
+
+ %wxchkver27 %define wxBK_TOP
+ %wxchkver27 %define wxBK_LEFT
+ %wxchkver27 %define wxBK_RIGHT
+ %wxchkver27 %define wxBK_BOTTOM
+
%typedef wxNotebookPage wxWindow
Index: wave.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wave.i 1 Aug 2005 19:43:33 -0000 1.3
--- wave.i 21 Nov 2005 23:42:59 -0000 1.4
***************
*** 4,14 ****
%if wxLUA_USE_wxWave
%win %define wxSOUND_SYNC
%win %define wxSOUND_ASYNC
%win %define wxSOUND_LOOP
- %if %msw&!%wxchkver25
- %include "wx/wave.h"
-
%class %delete %noclassinfo wxWave, wxObject
wxWave(const wxString& fileName, bool isResource = FALSE)
--- 4,15 ----
%if wxLUA_USE_wxWave
+ %if %msw&!%wxchkver25
+ %if wxUSE_WAVE
+ %include "wx/wave.h"
+
%win %define wxSOUND_SYNC
%win %define wxSOUND_ASYNC
%win %define wxSOUND_LOOP
%class %delete %noclassinfo wxWave, wxObject
wxWave(const wxString& fileName, bool isResource = FALSE)
***************
*** 19,25 ****
%wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const
%endclass
- %endif
! // FIXME add wxSound for >2.5
%endif wxLUA_USE_wxWave
--- 20,53 ----
%wxchkver25 bool Play(unsigned int flags = wxSOUND_ASYNC) const
%endclass
! %endif // wxUSE_WAVE
! %endif // %msw&!%wxchkver25
!
! // ----------------------------------------------------------------------------
!
! %if %wxchkver26
! %if wxUSE_SOUND
! %include "wx/sound.h"
!
! %define wxSOUND_SYNC
! %define wxSOUND_ASYNC
! %define wxSOUND_LOOP
!
! %class %delete %noclassinfo wxSound, wxObject
! %constructor wxSoundDefault()
! wxSound(const wxString& fileName, bool isResource = false)
! //wxSound(int size, const wxByte* data)
!
! bool Create(const wxString& fileName, bool isResource = false)
! //%rename CreateFromData bool Create(int size, const wxByte* data)
! bool IsOk() const
! bool Play(unsigned int flags = wxSOUND_ASYNC) const
! //%wxcompat24 bool Play(bool async, bool looped = false) const
! %rename PlayFile static bool Play(const wxString& filename, unsigned flags = wxSOUND_ASYNC)
! static void Stop()
! %endclass
!
! %endif // wxUSE_SOUND
! %endif // %wxchkver26
%endif wxLUA_USE_wxWave
|
