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

renamed wxWave to wxSound

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-02 13:03:23 +00:00
parent 3aefa658c8
commit d93966b92a
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/joytest/Makefile.in
View File

@@ -28,6 +28,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_SDL = @EXTRALIBS_SDL@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -48,6 +49,7 @@ JOYTEST_OBJECTS = \
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
@COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -125,7 +127,7 @@ distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
$(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__joytest___mac_rezcmd)
$(__joytest___mac_setfilecmd)
$(__joytest___os2_emxbindcmd)

10
samples/joytest/joytest.cpp
View File

@@ -28,7 +28,7 @@
# error You must set wxUSE_STATUSBAR to 1 in setup.h
#endif
#include "wx/wave.h"
#include "wx/sound.h"
#include "wx/joystick.h"
#include "joytest.h"
@@ -53,9 +53,9 @@ bool MyApp::OnInit()
return FALSE;
}
#if wxUSE_WAVE
#if wxUSE_SOUND
m_fire.Create(_T("gun.wav"));
#endif // wxUSE_WAVE
#endif // wxUSE_SOUND
m_maxX = stick.GetXMax();
m_maxY = stick.GetYMax();
@@ -143,12 +143,12 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
frame->SetStatusText(buf);
#if wxUSE_WAVE
#if wxUSE_SOUND
if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
{
wxGetApp().m_fire.Play();
}
#endif // wxUSE_WAVE
#endif // wxUSE_SOUND
}
BEGIN_EVENT_TABLE(MyFrame, wxFrame)

6
samples/joytest/joytest.h
View File

@@ -19,9 +19,9 @@ public:
int m_maxX;
int m_maxY;
#if wxUSE_WAVE
wxWave m_fire;
#endif // wxUSE_WAVE
#if wxUSE_SOUND
wxSound m_fire;
#endif // wxUSE_SOUND
};
DECLARE_APP(MyApp)