From 002ed9af8309d5baa1b2c32f1fd28160595e2fa7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Mon, 2 Feb 2004 14:34:35 +0000 Subject: [PATCH] renamed wxWave to wxSound git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 83 +++++++++++++++++---------------- autoconf_inc.m4 | 4 +- build/msw/makefile.bcc | 32 ++++++------- build/msw/makefile.gcc | 28 +++++------ build/msw/makefile.vc | 32 ++++++------- build/msw/makefile.wat | 32 ++++++------- build/msw/wx_adv.dsp | 12 +++-- build/msw/wx_core.dsp | 12 +++-- configure | 37 +++++++-------- configure.in | 10 ++-- include/wx/mac/setup0.h | 4 +- include/wx/msw/setup0.h | 4 +- include/wx/msw/setup_microwin.h | 4 +- include/wx/msw/wince/setup.h | 4 +- include/wx/os2/setup0.h | 2 +- include/wx/univ/setup0.h | 4 +- setup.h.in | 2 +- setup.h_vms | 2 +- src/wxWindows.dsp | 20 ++++---- 19 files changed, 171 insertions(+), 157 deletions(-) diff --git a/Makefile.in b/Makefile.in index 464bdc188e..50c71519a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1668,14 +1668,14 @@ COND_TOOLKIT_PM_GUI_HDR = \ @COND_TOOLKIT_GTK@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_GTK@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h @COND_TOOLKIT_MAC@ADVANCED_PLATFORM_HDR = \ -@COND_TOOLKIT_MAC@ wx/mac/joystick.h wx/mac/wave.h +@COND_TOOLKIT_MAC@ wx/mac/joystick.h wx/mac/sound.h @COND_TOOLKIT_MOTIF@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_MOTIF@ wx/unix/joystick.h wx/unix/sound.h \ @COND_TOOLKIT_MOTIF@ wx/unix/taskbarx11.h @COND_TOOLKIT_MSW@ADVANCED_PLATFORM_HDR = \ -@COND_TOOLKIT_MSW@ wx/msw/joystick.h wx/msw/taskbar.h wx/msw/wave.h +@COND_TOOLKIT_MSW@ wx/msw/joystick.h wx/msw/sound.h wx/msw/taskbar.h @COND_TOOLKIT_PM@ADVANCED_PLATFORM_HDR = wx/os2/joystick.h \ -@COND_TOOLKIT_PM@ wx/os2/wave.h +@COND_TOOLKIT_PM@ wx/os2/sound.h @COND_TOOLKIT_X11@ADVANCED_PLATFORM_HDR = \ @COND_TOOLKIT_X11@ wx/unix/joystick.h wx/unix/sound.h wx/unix/taskbarx11.h @COND_USE_GUI_1_WXUNIV_0@GUI_CORE_HEADERS = $(GUI_HDR) @@ -2729,7 +2729,7 @@ COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarx11.o @COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS) @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS = \ -@COND_TOOLKIT_MAC@ monodll_joystick.o monodll_wave.o +@COND_TOOLKIT_MAC@ monodll_joystick.o monodll_sound.o COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_joystick.o \ @@ -2737,10 +2737,10 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarx11.o @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS = \ -@COND_TOOLKIT_MSW@ monodll_taskbarcmn.o monodll_joystick.o \ -@COND_TOOLKIT_MSW@ monodll_taskbar.o monodll_wave.o +@COND_TOOLKIT_MSW@ monodll_taskbarcmn.o monodll_joystick.o monodll_sound.o \ +@COND_TOOLKIT_MSW@ monodll_taskbar.o @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS = \ -@COND_TOOLKIT_PM@ monodll_joystick.o monodll_wave.o +@COND_TOOLKIT_PM@ monodll_joystick.o monodll_sound.o COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS = \ monodll_taskbarcmn.o \ monodll_joystick.o \ @@ -3513,7 +3513,7 @@ COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarx11.o @COND_TOOLKIT_GTK@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_GTK___ADVANCED_PLATFORM_SRC_OBJECTS_1) @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_MAC@ monolib_joystick.o monolib_wave.o +@COND_TOOLKIT_MAC@ monolib_joystick.o monolib_sound.o COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarcmn.o \ monolib_joystick.o \ @@ -3521,10 +3521,10 @@ COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarx11.o @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = $(COND_TOOLKIT_MOTIF___ADVANCED_PLATFORM_SRC_OBJECTS_1) @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_MSW@ monolib_taskbarcmn.o monolib_joystick.o \ -@COND_TOOLKIT_MSW@ monolib_taskbar.o monolib_wave.o +@COND_TOOLKIT_MSW@ monolib_taskbarcmn.o monolib_joystick.o monolib_sound.o \ +@COND_TOOLKIT_MSW@ monolib_taskbar.o @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ -@COND_TOOLKIT_PM@ monolib_joystick.o monolib_wave.o +@COND_TOOLKIT_PM@ monolib_joystick.o monolib_sound.o COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \ monolib_taskbarcmn.o \ monolib_joystick.o \ @@ -5150,15 +5150,15 @@ COND_USE_SOSYMLINKS_1___advdll___so_symlinks_inst_cmd = rm -f \ @COND_TOOLKIT_GTK@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \ @COND_TOOLKIT_GTK@ advdll_taskbarx11.o @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_MAC@ advdll_joystick.o advdll_wave.o +@COND_TOOLKIT_MAC@ advdll_joystick.o advdll_sound.o @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_MOTIF@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \ @COND_TOOLKIT_MOTIF@ advdll_taskbarx11.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_MSW@ advdll_taskbarcmn.o advdll_joystick.o advdll_taskbar.o \ -@COND_TOOLKIT_MSW@ advdll_wave.o +@COND_TOOLKIT_MSW@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \ +@COND_TOOLKIT_MSW@ advdll_taskbar.o @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ -@COND_TOOLKIT_PM@ advdll_joystick.o advdll_wave.o +@COND_TOOLKIT_PM@ advdll_joystick.o advdll_sound.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_2 = \ @COND_TOOLKIT_X11@ advdll_taskbarcmn.o advdll_joystick.o advdll_sound.o \ @COND_TOOLKIT_X11@ advdll_taskbarx11.o @@ -5176,15 +5176,15 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1___advlib___depname = \ @COND_TOOLKIT_GTK@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \ @COND_TOOLKIT_GTK@ advlib_taskbarx11.o @COND_TOOLKIT_MAC@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_MAC@ advlib_joystick.o advlib_wave.o +@COND_TOOLKIT_MAC@ advlib_joystick.o advlib_sound.o @COND_TOOLKIT_MOTIF@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_MOTIF@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \ @COND_TOOLKIT_MOTIF@ advlib_taskbarx11.o @COND_TOOLKIT_MSW@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_MSW@ advlib_taskbarcmn.o advlib_joystick.o advlib_taskbar.o \ -@COND_TOOLKIT_MSW@ advlib_wave.o +@COND_TOOLKIT_MSW@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \ +@COND_TOOLKIT_MSW@ advlib_taskbar.o @COND_TOOLKIT_PM@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ -@COND_TOOLKIT_PM@ advlib_joystick.o advlib_wave.o +@COND_TOOLKIT_PM@ advlib_joystick.o advlib_sound.o @COND_TOOLKIT_X11@__ADVANCED_PLATFORM_SRC_OBJECTS_3 = \ @COND_TOOLKIT_X11@ advlib_taskbarcmn.o advlib_joystick.o advlib_sound.o \ @COND_TOOLKIT_X11@ advlib_taskbarx11.o @@ -9657,15 +9657,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@monodll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONODLL_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monodll_wave.o: $(srcdir)/src/msw/wave.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monodll_sound.o: $(srcdir)/src/msw/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1@monodll_wave.o: $(srcdir)/src/mac/wave.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1@monodll_sound.o: $(srcdir)/src/mac/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1@monodll_wave.o: $(srcdir)/src/os2/wave.cpp $(MONODLL_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -9675,6 +9672,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monodll_sound.o: $(srcdir)/src/unix/sound.cpp $(MONODLL_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monodll_sound.o: $(srcdir)/src/os2/sound.cpp $(MONODLL_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monodll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONODLL_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $< @@ -12264,15 +12264,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@monolib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW_USE_GUI_1@monolib_wave.o: $(srcdir)/src/msw/wave.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MSW_USE_GUI_1@monolib_sound.o: $(srcdir)/src/msw/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MSW_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC_USE_GUI_1@monolib_wave.o: $(srcdir)/src/mac/wave.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_MAC_USE_GUI_1@monolib_sound.o: $(srcdir)/src/mac/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MAC_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM_USE_GUI_1@monolib_wave.o: $(srcdir)/src/os2/wave.cpp $(MONOLIB_ODEP) -@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -12282,6 +12279,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@monolib_sound.o: $(srcdir)/src/unix/sound.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_X11_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM_USE_GUI_1@monolib_sound.o: $(srcdir)/src/os2/sound.cpp $(MONOLIB_ODEP) +@COND_TOOLKIT_PM_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF_USE_GUI_1@monolib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(MONOLIB_ODEP) @COND_TOOLKIT_MOTIF_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $< @@ -17280,15 +17280,12 @@ advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_PM@advdll_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_TOOLKIT_MSW@advdll_wave.o: $(srcdir)/src/msw/wave.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_MSW@advdll_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_TOOLKIT_MAC@advdll_wave.o: $(srcdir)/src/mac/wave.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_MAC@advdll_sound.o: $(srcdir)/src/mac/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< -@COND_TOOLKIT_PM@advdll_wave.o: $(srcdir)/src/os2/wave.cpp $(ADVDLL_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -17298,6 +17295,9 @@ advdll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@advdll_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< +@COND_TOOLKIT_PM@advdll_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVDLL_ODEP) +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF@advdll_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVDLL_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $< @@ -17376,15 +17376,12 @@ advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_PM@advlib_joystick.o: $(srcdir)/src/os2/joystick.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_TOOLKIT_MSW@advlib_wave.o: $(srcdir)/src/msw/wave.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_MSW@advlib_sound.o: $(srcdir)/src/msw/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MSW@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_TOOLKIT_MAC@advlib_wave.o: $(srcdir)/src/mac/wave.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_MAC@advlib_sound.o: $(srcdir)/src/mac/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MAC@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< -@COND_TOOLKIT_PM@advlib_wave.o: $(srcdir)/src/os2/wave.cpp $(ADVLIB_ODEP) -@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< - @COND_TOOLKIT_MOTIF@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -17394,6 +17391,9 @@ advlib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@advlib_sound.o: $(srcdir)/src/unix/sound.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_X11@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< +@COND_TOOLKIT_PM@advlib_sound.o: $(srcdir)/src/os2/sound.cpp $(ADVLIB_ODEP) +@COND_TOOLKIT_PM@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< + @COND_TOOLKIT_MOTIF@advlib_taskbarx11.o: $(srcdir)/src/unix/taskbarx11.cpp $(ADVLIB_ODEP) @COND_TOOLKIT_MOTIF@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $< @@ -18440,6 +18440,11 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/sockets/*.cpp $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/*.xpm $(DISTDIR)/samples/sockets + mkdir $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/Makefile.in $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/*.cpp $(DISTDIR)/samples/sound + cp $(SAMPDIR)/sound/*.wav $(DISTDIR)/samples/sound + mkdir $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter cp $(SAMPDIR)/splitter/makefile.unx $(DISTDIR)/samples/splitter diff --git a/autoconf_inc.m4 b/autoconf_inc.m4 index bbff5e7a7d..1da7a7845e 100644 --- a/autoconf_inc.m4 +++ b/autoconf_inc.m4 @@ -2,9 +2,6 @@ dnl This macro was generated by dnl Bakefile 0.1.2 (http://bakefile.sourceforge.net) dnl Do not modify, all changes will be overwritten! - -dnl Conditions: - dnl ### begin block 0_AC_BAKEFILE_PRECOMP_HEADERS ### AC_BAKEFILE_PRECOMP_HEADERS @@ -640,3 +637,4 @@ dnl ### begin block 1_COND_WXUSE_ZLIB_BUILTIN ### COND_WXUSE_ZLIB_BUILTIN="" fi AC_SUBST(COND_WXUSE_ZLIB_BUILTIN) +USE_ZLIB_BUILTIN) diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc index 20cd73bb13..747c30f1f5 100644 --- a/build/msw/makefile.bcc +++ b/build/msw/makefile.bcc @@ -651,8 +651,8 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_wave.obj + $(OBJS)\advdll_sound.obj \ + $(OBJS)\advdll_taskbar.obj ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -674,8 +674,8 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_wave.obj + $(OBJS)\advlib_sound.obj \ + $(OBJS)\advlib_taskbar.obj ODBCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ $(__UNICODE_DEFINE_p) -I..\..\include -I$(SETUPHDIR) -I..\..\src\tiff \ @@ -878,8 +878,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -1314,8 +1314,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -2802,7 +2802,7 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_bcc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG) $@ !endif @@ -2866,7 +2866,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_bcc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) @&&| - c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, + c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib import32.lib cw32mt$(__RUNTIME_LIBS_2).lib,, | implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv $@ !endif @@ -3779,10 +3779,10 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -5256,10 +5256,10 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -9111,10 +9111,10 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp @@ -9159,10 +9159,10 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc index 2b50abe1a4..d0c5d7a5eb 100644 --- a/build/msw/makefile.gcc +++ b/build/msw/makefile.gcc @@ -635,8 +635,8 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_wizard.o \ $(OBJS)\advdll_taskbarcmn.o \ $(OBJS)\advdll_joystick.o \ - $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_wave.o + $(OBJS)\advdll_sound.o \ + $(OBJS)\advdll_taskbar.o ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -657,8 +657,8 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_wizard.o \ $(OBJS)\advlib_taskbarcmn.o \ $(OBJS)\advlib_joystick.o \ - $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_wave.o + $(OBJS)\advlib_sound.o \ + $(OBJS)\advlib_taskbar.o ODBCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I..\..\include -I$(SETUPHDIR) -Wall -I..\..\src\tiff -I..\..\src\jpeg \ @@ -866,8 +866,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.o \ $(OBJS)\monodll_taskbarcmn.o \ $(OBJS)\monodll_joystick.o \ + $(OBJS)\monodll_sound.o \ $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_wave.o \ $(OBJS)\monodll_helpbest.o \ $(OBJS)\monodll_helpctrl.o \ $(OBJS)\monodll_helpdata.o \ @@ -1308,8 +1308,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.o \ $(OBJS)\monolib_taskbarcmn.o \ $(OBJS)\monolib_joystick.o \ + $(OBJS)\monolib_sound.o \ $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_wave.o \ $(OBJS)\monolib_helpbest.o \ $(OBJS)\monolib_helpctrl.o \ $(OBJS)\monolib_helpdata.o \ @@ -3824,10 +3824,10 @@ $(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wave.o: ../../src/msw/wave.cpp +$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp @@ -5401,10 +5401,10 @@ $(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_wave.o: ../../src/msw/wave.cpp +$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp @@ -9556,10 +9556,10 @@ $(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_wave.o: ../../src/msw/wave.cpp +$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advlib_dummy.o: ../../src/msw/dummy.cpp @@ -9604,10 +9604,10 @@ $(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp $(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp +$(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_wave.o: ../../src/msw/wave.cpp +$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\odbcdll_dummy.o: ../../src/msw/dummy.cpp diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc index 2088a9b139..042bab6e20 100644 --- a/build/msw/makefile.vc +++ b/build/msw/makefile.vc @@ -698,8 +698,8 @@ ADVDLL_OBJECTS = \ $(OBJS)\advdll_wizard.obj \ $(OBJS)\advdll_taskbarcmn.obj \ $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_wave.obj + $(OBJS)\advdll_sound.obj \ + $(OBJS)\advdll_taskbar.obj ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_171) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.pdb \ @@ -724,8 +724,8 @@ ADVLIB_OBJECTS = \ $(OBJS)\advlib_wizard.obj \ $(OBJS)\advlib_taskbarcmn.obj \ $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_wave.obj + $(OBJS)\advlib_sound.obj \ + $(OBJS)\advlib_taskbar.obj ODBCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_183) /DWIN32 \ $(__DEBUGINFO) \ /Fd$(LIBDIRNAME)\wxbase251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_odbc_vc$(VENDORTAG).pdb \ @@ -1086,8 +1086,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ $(OBJS)\monodll_wizard.obj \ $(OBJS)\monodll_taskbarcmn.obj \ $(OBJS)\monodll_joystick.obj \ + $(OBJS)\monodll_sound.obj \ $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_wave.obj \ $(OBJS)\monodll_helpbest.obj \ $(OBJS)\monodll_helpctrl.obj \ $(OBJS)\monodll_helpdata.obj \ @@ -1540,8 +1540,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ $(OBJS)\monolib_wizard.obj \ $(OBJS)\monolib_taskbarcmn.obj \ $(OBJS)\monolib_joystick.obj \ + $(OBJS)\monolib_sound.obj \ $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_wave.obj \ $(OBJS)\monolib_helpbest.obj \ $(OBJS)\monolib_helpctrl.obj \ $(OBJS)\monolib_helpdata.obj \ @@ -3370,7 +3370,7 @@ $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) !if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_vc$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< - $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib + $(MONODLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib << !endif @@ -3430,7 +3430,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.li !if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_vc$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXDEBUGFLAG).lib $(__coredll___depname) $(__basedll___depname) link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_22) /LIBPATH:$(LIBDIRNAME) @<< - $(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib + $(ADVDLL_OBJECTS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib << !endif @@ -4337,10 +4337,10 @@ $(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** -$(OBJS)\monodll_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $** $(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -5814,10 +5814,10 @@ $(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** -$(OBJS)\monolib_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $** $(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp @@ -9669,10 +9669,10 @@ $(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** -$(OBJS)\advdll_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $** $(OBJS)\advlib_dummy.obj: ..\..\src\msw\dummy.cpp @@ -9717,10 +9717,10 @@ $(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp +$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** -$(OBJS)\advlib_wave.obj: ..\..\src\msw\wave.cpp +$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $** $(OBJS)\odbcdll_dummy.obj: ..\..\src\msw\dummy.cpp diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat index 600244318a..75fcbeb285 100644 --- a/build/msw/makefile.wat +++ b/build/msw/makefile.wat @@ -105,8 +105,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & $(OBJS)\monodll_wizard.obj & $(OBJS)\monodll_taskbarcmn.obj & $(OBJS)\monodll_joystick.obj & + $(OBJS)\monodll_sound.obj & $(OBJS)\monodll_taskbar.obj & - $(OBJS)\monodll_wave.obj & $(OBJS)\monodll_helpbest.obj & $(OBJS)\monodll_helpctrl.obj & $(OBJS)\monodll_helpdata.obj & @@ -550,8 +550,8 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & $(OBJS)\monolib_wizard.obj & $(OBJS)\monolib_taskbarcmn.obj & $(OBJS)\monolib_joystick.obj & + $(OBJS)\monolib_sound.obj & $(OBJS)\monolib_taskbar.obj & - $(OBJS)\monolib_wave.obj & $(OBJS)\monolib_helpbest.obj & $(OBJS)\monolib_helpctrl.obj & $(OBJS)\monolib_helpdata.obj & @@ -2651,8 +2651,8 @@ ADVDLL_OBJECTS = & $(OBJS)\advdll_wizard.obj & $(OBJS)\advdll_taskbarcmn.obj & $(OBJS)\advdll_joystick.obj & - $(OBJS)\advdll_taskbar.obj & - $(OBJS)\advdll_wave.obj + $(OBJS)\advdll_sound.obj & + $(OBJS)\advdll_taskbar.obj ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2674,8 +2674,8 @@ ADVLIB_OBJECTS = & $(OBJS)\advlib_wizard.obj & $(OBJS)\advlib_taskbarcmn.obj & $(OBJS)\advlib_joystick.obj & - $(OBJS)\advlib_taskbar.obj & - $(OBJS)\advlib_wave.obj + $(OBJS)\advlib_sound.obj & + $(OBJS)\advlib_taskbar.obj ODBCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) & -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) & -i=..\..\include -i=$(SETUPHDIR) -i=..\..\src\tiff -i=..\..\src\jpeg & @@ -2913,7 +2913,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_wat$(V @%append $(OBJS)\monodll.lbc option caseexact @%append $(OBJS)\monodll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\monodll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\monodll.lbc library %i @%append $(OBJS)\monodll.lbc @%append $(OBJS)\monodll.lbc system nt_dll wlink @$(OBJS)\monodll.lbc @@ -3022,7 +3022,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv_wa @%append $(OBJS)\advdll.lbc option caseexact @%append $(OBJS)\advdll.lbc $(LDFLAGS) $(__DEBUGINFO_10) libpath $(LIBDIRNAME) @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib) do @%append $(OBJS)\advdll.lbc library %i + @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib $(LIBDIRNAME)\wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib ) do @%append $(OBJS)\advdll.lbc library %i @%append $(OBJS)\advdll.lbc @%append $(OBJS)\advdll.lbc system nt_dll wlink @$(OBJS)\advdll.lbc @@ -4012,10 +4012,10 @@ $(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp +$(OBJS)\monodll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -$(OBJS)\monodll_wave.obj : .AUTODEPEND ..\..\src\msw\wave.cpp +$(OBJS)\monodll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(OBJS)\monodll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp @@ -5589,10 +5589,10 @@ $(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp +$(OBJS)\monolib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -$(OBJS)\monolib_wave.obj : .AUTODEPEND ..\..\src\msw\wave.cpp +$(OBJS)\monolib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(OBJS)\monolib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp @@ -9744,10 +9744,10 @@ $(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp +$(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< -$(OBJS)\advdll_wave.obj : .AUTODEPEND ..\..\src\msw\wave.cpp +$(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< $(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp @@ -9792,10 +9792,10 @@ $(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp $(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp +$(OBJS)\advlib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< -$(OBJS)\advlib_wave.obj : .AUTODEPEND ..\..\src\msw\wave.cpp +$(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp $(CXX) -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< $(OBJS)\odbcdll_dummy.obj : .AUTODEPEND ..\..\src\msw\dummy.cpp diff --git a/build/msw/wx_adv.dsp b/build/msw/wx_adv.dsp index 7ea55f3f17..d5932784df 100644 --- a/build/msw/wx_adv.dsp +++ b/build/msw/wx_adv.dsp @@ -470,11 +470,11 @@ SOURCE=..\..\src\msw\joystick.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\taskbar.cpp +SOURCE=..\..\src\msw\sound.cpp # End Source File # Begin Source File -SOURCE=..\..\src\msw\wave.cpp +SOURCE=..\..\src\msw\taskbar.cpp # End Source File # End Group # Begin Group "Generic Sources" @@ -705,11 +705,11 @@ SOURCE=..\..\include\wx\msw\joystick.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\taskbar.h +SOURCE=..\..\include\wx\msw\sound.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\wave.h +SOURCE=..\..\include\wx\msw\taskbar.h # End Source File # End Group # Begin Group "Generic Headers" @@ -781,6 +781,10 @@ SOURCE=..\..\include\wx\sashwin.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\sound.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\splash.h # End Source File # Begin Source File diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp index 0927dfeb7c..ba49c5cf1a 100644 --- a/build/msw/wx_core.dsp +++ b/build/msw/wx_core.dsp @@ -7476,6 +7476,10 @@ SOURCE=..\..\include\wx\msw\slidrmsw.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\msw\sound.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\msw\spinbutt.h # End Source File # Begin Source File @@ -7548,10 +7552,6 @@ SOURCE=..\..\include\wx\msw\ole\uuid.h # End Source File # Begin Source File -SOURCE=..\..\include\wx\msw\wave.h -# End Source File -# Begin Source File - SOURCE=..\..\include\wx\msw\window.h # End Source File # Begin Source File @@ -8412,6 +8412,10 @@ SOURCE=..\..\include\wx\slider.h # End Source File # Begin Source File +SOURCE=..\..\include\wx\sound.h +# End Source File +# Begin Source File + SOURCE=..\..\include\wx\spinbutt.h # End Source File # Begin Source File diff --git a/configure b/configure index 33767fbc32..c6171e2dcb 100755 --- a/configure +++ b/configure @@ -928,7 +928,7 @@ Optional Features: --enable-textfile use wxTextFile class --enable-timer use wxTimer class --enable-unicode compile wxString with Unicode support - --enable-wave use wxWave class + --enable-sound use wxSound class --enable-wxprintfv use wxWindows implementation of vprintf() --enable-zipstream use wxZipInputStream --enable-gzstream use wxGzipInputStream @@ -2061,7 +2061,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FFILE=no DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_WAVE=no + DEFAULT_wxUSE_SOUND=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_FONTMAP=no @@ -2244,7 +2244,7 @@ else DEFAULT_wxUSE_FFILE=yes DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_WAVE=yes + DEFAULT_wxUSE_SOUND=yes DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_FONTMAP=yes @@ -5582,38 +5582,38 @@ echo "${ECHO_T}no" >&6 enablestring= - echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6 no_cache=0 - # Check whether --enable-wave or --disable-wave was given. -if test "${enable_wave+set}" = set; then - enableval="$enable_wave" + # Check whether --enable-sound or --disable-sound was given. +if test "${enable_sound+set}" = set; then + enableval="$enable_sound" if test "$enableval" = yes; then - ac_cv_use_wave='wxUSE_WAVE=yes' + ac_cv_use_sound='wxUSE_SOUND=yes' else - ac_cv_use_wave='wxUSE_WAVE=no' + ac_cv_use_sound='wxUSE_SOUND=no' fi else - LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}` + LINE=`grep "wxUSE_SOUND" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" else no_cache=1 fi - ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE + ac_cv_use_sound='wxUSE_SOUND='$DEFAULT_wxUSE_SOUND fi; - eval "$ac_cv_use_wave" + eval "$ac_cv_use_sound" if test "$no_cache" != 1; then - echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp + echo $ac_cv_use_sound >> ${wx_arg_cache_file}.tmp fi - if test "$wxUSE_WAVE" = yes; then + if test "$wxUSE_SOUND" = yes; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 else @@ -33489,7 +33489,7 @@ _ACEOF fi WITH_PLUGIN_SDL=0 -if test "$wxUSE_WAVE" = "yes"; then +if test "$wxUSE_SOUND" = "yes"; then if test "$USE_UNIX" = "1" ; then for ac_header in sys/soundcard.h @@ -33948,7 +33948,7 @@ rm -f conftest.err conftest.$ac_objext \ fi cat >>confdefs.h <<\_ACEOF -#define wxUSE_WAVE 1 +#define wxUSE_SOUND 1 _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" @@ -38527,8 +38527,6 @@ fi - - # Check whether --enable-precomp-headers or --disable-precomp-headers was given. if test "${enable_precomp_headers+set}" = set; then enableval="$enable_precomp_headers" @@ -39184,6 +39182,7 @@ EOF COND_WXUSE_ZLIB_BUILTIN="" fi +USE_ZLIB_BUILTIN) diff --git a/configure.in b/configure.in index bcd13a185d..d42426fc2d 100644 --- a/configure.in +++ b/configure.in @@ -413,7 +413,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FFILE=no DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_WAVE=no + DEFAULT_wxUSE_SOUND=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_FONTMAP=no @@ -596,7 +596,7 @@ else DEFAULT_wxUSE_FFILE=yes DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_WAVE=yes + DEFAULT_wxUSE_SOUND=yes DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_FONTMAP=yes @@ -877,7 +877,7 @@ WX_ARG_ENABLE(textbuf, [ --enable-textbuf use wxTextBuffer class], WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE) WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER) WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE) -WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) +WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND) WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) WX_ARG_ENABLE(gzstream, [ --enable-gzstream use wxGzipInputStream], wxUSE_GZSTREAM) @@ -4456,7 +4456,7 @@ if test "$wxUSE_TIMER" = "yes"; then fi WITH_PLUGIN_SDL=0 -if test "$wxUSE_WAVE" = "yes"; then +if test "$wxUSE_SOUND" = "yes"; then dnl Unix implementation needs additional checks because audio support dnl comes in many favours: if test "$USE_UNIX" = "1" ; then @@ -4476,7 +4476,7 @@ if test "$wxUSE_WAVE" = "yes"; then fi fi - AC_DEFINE(wxUSE_WAVE) + AC_DEFINE(wxUSE_SOUND) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" fi diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index 2d1ff52d2c..c0b2f7642e 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -428,8 +428,8 @@ // wxSystemOptions class #define wxUSE_SYSTEM_OPTIONS 1 -// wxWave class -#define wxUSE_WAVE 1 +// wxSound class +#define wxUSE_SOUND 1 // XML parsing classes. Note that their API will change in the future, so // using wxXmlDocument and wxXmlNode in your app is not recommended. diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 6a7378edb8..1efd582ebe 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -448,8 +448,8 @@ // wxSystemOptions class #define wxUSE_SYSTEM_OPTIONS 1 -// wxWave class -#define wxUSE_WAVE 1 +// wxSound class +#define wxUSE_SOUND 1 // XML parsing classes. Note that their API will change in the future, so // using wxXmlDocument and wxXmlNode in your app is not recommended. diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h index 348b6c316a..9ef05acb32 100644 --- a/include/wx/msw/setup_microwin.h +++ b/include/wx/msw/setup_microwin.h @@ -389,8 +389,8 @@ // contribute us a makefile for src/regex for it #define wxUSE_REGEX 0 -// wxWave class -#define wxUSE_WAVE 0 +// wxSound class +#define wxUSE_SOUND 0 // ---------------------------------------------------------------------------- // Individual GUI controls diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 59d2c0e571..d2c256e6d8 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -444,8 +444,8 @@ // wxSystemOptions class #define wxUSE_SYSTEM_OPTIONS 1 -// wxWave class -#define wxUSE_WAVE 1 +// wxSound class +#define wxUSE_SOUND 1 // XML parsing classes. Note that their API will change in the future, so // using wxXmlDocument and wxXmlNode in your app is not recommended. diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index 58d1b1297c..0b32d13e25 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -372,7 +372,7 @@ // needed for wxCanvas #define wxUSE_MENUS 1 -#define wxUSE_WAVE 1 +#define wxUSE_SOUND 1 #define wxUSE_REGEX 1 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 1396497492..6a520cef36 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -484,8 +484,8 @@ // wxSystemOptions class #define wxUSE_SYSTEM_OPTIONS 1 -// wxWave class -#define wxUSE_WAVE 1 +// wxSound class +#define wxUSE_SOUND 1 // XML parsing classes. Note that their API will change in the future, so // using wxXmlDocument and wxXmlNode in your app is not recommended. diff --git a/setup.h.in b/setup.h.in index 01f888a847..fa0d1e1569 100644 --- a/setup.h.in +++ b/setup.h.in @@ -605,7 +605,7 @@ /* * Use wave class */ -#define wxUSE_WAVE 0 +#define wxUSE_SOUND 0 /* * Use config system */ diff --git a/setup.h_vms b/setup.h_vms index 5494c52ad1..454e2b82ea 100644 --- a/setup.h_vms +++ b/setup.h_vms @@ -612,7 +612,7 @@ /* * Use wave class */ -#define wxUSE_WAVE 1 +#define wxUSE_SOUND 1 /* * Use config system */ diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp index 1616528df3..5143ab2457 100644 --- a/src/wxWindows.dsp +++ b/src/wxWindows.dsp @@ -1474,6 +1474,10 @@ SOURCE=.\msw\snglinst.cpp # End Source File # Begin Source File +SOURCE=.\msw\sound.cpp +# End Source File +# Begin Source File + SOURCE=.\msw\spinbutt.cpp # End Source File # Begin Source File @@ -1562,10 +1566,6 @@ SOURCE=.\msw\volume.cpp # End Source File # Begin Source File -SOURCE=.\msw\wave.cpp -# End Source File -# Begin Source File - SOURCE=.\msw\window.cpp # End Source File # End Group @@ -2502,6 +2502,10 @@ SOURCE=..\include\wx\socket.h # End Source File # Begin Source File +SOURCE=..\include\wx\sound.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\spinbutt.h # End Source File # Begin Source File @@ -3110,6 +3114,10 @@ SOURCE=..\include\wx\msw\slidrmsw.h # End Source File # Begin Source File +SOURCE=..\include\wx\msw\sound.h +# End Source File +# Begin Source File + SOURCE=..\include\wx\msw\spinbutt.h # End Source File # Begin Source File @@ -3178,10 +3186,6 @@ SOURCE=..\include\wx\msw\treectrl.h # End Source File # Begin Source File -SOURCE=..\include\wx\msw\wave.h -# End Source File -# Begin Source File - SOURCE=..\include\wx\msw\window.h # End Source File # Begin Source File -- 2.45.2