[matroska] r1116 - in trunk/DvdMenuXtractor: . libdvdread/win32

[email protected]
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]> 
Author: robux4
Date: 2005-04-09 22:28:58 +0400 (Sat, 09 Apr 2005)
New Revision: 1116

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
   trunk/DvdMenuXtractor/DvdMenuXtractor.sln
   trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
   trunk/DvdMenuXtractor/MyWizard.cpp
   trunk/DvdMenuXtractor/libdvdread/win32/libdvdread.vcproj
Log:
DMX: compile using wxWidgets 2.5.4

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-05 12:02:58 UTC (rev 1115)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-09 18:28:58 UTC (rev 1116)
@@ -73,7 +73,7 @@
 wxString outputDirectory;
 wxString mtxDirectory;
 const wxString APPLICATION_NAME = "DVDMenuXtractor: DMX - a fair-use tool";
-const wxString APPLICATION_VERSION = "0.9.3";
+const wxString APPLICATION_VERSION = "0.9.4";
 
 // ----------------------------------------------------------------------------
 
@@ -780,14 +780,14 @@
 					wxYield();
 				}
 				
-				// create the command line using the list of used files
+				// create the command line using the list of used files
                 // alwways put video first
 				if (demuxer.FileExists(VIDEO_STREAM))
-					MtxCommandString += demuxer.GetString(VIDEO_STREAM);
+					MtxCommandString += demuxer.GetString(VIDEO_STREAM);
 
 				for (_stream = 0; _stream < 256; _stream++)
-				{
-					if (_stream == VIDEO_STREAM)
+				{
+					if (_stream == VIDEO_STREAM)
 						continue;
 					if (demuxer.FileExists(_stream))
 						MtxCommandString += demuxer.GetString(_stream);

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.sln
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.sln	2005-04-05 12:02:58 UTC (rev 1115)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.sln	2005-04-09 18:28:58 UTC (rev 1116)
@@ -1,6 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DvdMenuXtractor", "DvdMenuXtractor.vcproj", "{13E98204-EB5E-4A66-96FC-4083CBB11D42}"
 	ProjectSection(ProjectDependencies) = postProject
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB} = {AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B} = {9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}
 		{0EE415C3-DA09-476C-A405-B493F80FC6CF} = {0EE415C3-DA09-476C-A405-B493F80FC6CF}
 	EndProjectSection
 EndProject
@@ -8,20 +10,162 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\wxMSW-2.5.4\wxWidgets-2.5.4\build\msw\wx_core.vcproj", "{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\wxMSW-2.5.4\wxWidgets-2.5.4\build\msw\wx_base.vcproj", "{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
+		DLL Debug = DLL Debug
+		DLL Release = DLL Release
+		DLL Unicode Debug = DLL Unicode Debug
+		DLL Unicode Release = DLL Unicode Release
+		DLL Universal Debug = DLL Universal Debug
+		DLL Universal Release = DLL Universal Release
+		DLL Universal Unicode Debug = DLL Universal Unicode Debug
+		DLL Universal Unicode Release = DLL Universal Unicode Release
 		Release = Release
+		Unicode Debug = Unicode Debug
+		Unicode Release = Unicode Release
+		Universal Debug = Universal Debug
+		Universal Release = Universal Release
+		Universal Unicode Debug = Universal Unicode Debug
+		Universal Unicode Release = Universal Unicode Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Debug.ActiveCfg = Debug|Win32
 		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Unicode Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Unicode Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Unicode Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Unicode Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Unicode Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Unicode Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Unicode Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.DLL Universal Unicode Release.Build.0 = Release|Win32
 		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Release.ActiveCfg = Release|Win32
 		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Unicode Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Unicode Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Unicode Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Unicode Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Release.Build.0 = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Unicode Debug.ActiveCfg = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Unicode Debug.Build.0 = Debug|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Unicode Release.ActiveCfg = Release|Win32
+		{13E98204-EB5E-4A66-96FC-4083CBB11D42}.Universal Unicode Release.Build.0 = Release|Win32
 		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Debug.ActiveCfg = Debug|Win32
 		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Unicode Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Unicode Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Unicode Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Unicode Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Unicode Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Unicode Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Unicode Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.DLL Universal Unicode Release.Build.0 = Release|Win32
 		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Release.ActiveCfg = Release|Win32
 		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Unicode Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Unicode Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Unicode Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Unicode Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Release.Build.0 = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Unicode Debug.ActiveCfg = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Unicode Debug.Build.0 = Debug|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Unicode Release.ActiveCfg = Release|Win32
+		{0EE415C3-DA09-476C-A405-B493F80FC6CF}.Universal Unicode Release.Build.0 = Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Debug.ActiveCfg = Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Debug.Build.0 = Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Debug.ActiveCfg = DLL Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Debug.Build.0 = DLL Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Release.ActiveCfg = DLL Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Release.Build.0 = DLL Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Unicode Debug.ActiveCfg = DLL Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Unicode Debug.Build.0 = DLL Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Unicode Release.ActiveCfg = DLL Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Unicode Release.Build.0 = DLL Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Release.Build.0 = DLL Universal Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Unicode Debug.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Unicode Debug.Build.0 = DLL Universal Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Unicode Release.ActiveCfg = DLL Universal Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.DLL Universal Unicode Release.Build.0 = DLL Universal Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Release.ActiveCfg = Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Release.Build.0 = Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Unicode Debug.Build.0 = Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Unicode Release.ActiveCfg = Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Unicode Release.Build.0 = Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Debug.ActiveCfg = Universal Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Debug.Build.0 = Universal Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Release.ActiveCfg = Universal Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Release.Build.0 = Universal Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Unicode Debug.ActiveCfg = Universal Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Unicode Debug.Build.0 = Universal Unicode Debug|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Unicode Release.ActiveCfg = Universal Unicode Release|Win32
+		{9EF1097A-42E8-43F9-B7BA-6A0F29A8556B}.Universal Unicode Release.Build.0 = Universal Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Debug.ActiveCfg = Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Debug.Build.0 = Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Debug.ActiveCfg = DLL Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Debug.Build.0 = DLL Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Release.ActiveCfg = DLL Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Release.Build.0 = DLL Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Unicode Debug.ActiveCfg = DLL Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Unicode Debug.Build.0 = DLL Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Unicode Release.ActiveCfg = DLL Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Unicode Release.Build.0 = DLL Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Debug.ActiveCfg = DLL Universal Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Debug.Build.0 = DLL Universal Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Release.ActiveCfg = DLL Universal Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Release.Build.0 = DLL Universal Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Unicode Debug.ActiveCfg = DLL Universal Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Unicode Debug.Build.0 = DLL Universal Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Unicode Release.ActiveCfg = DLL Universal Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.DLL Universal Unicode Release.Build.0 = DLL Universal Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Release.ActiveCfg = Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Release.Build.0 = Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Unicode Debug.ActiveCfg = Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Unicode Debug.Build.0 = Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Unicode Release.ActiveCfg = Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Unicode Release.Build.0 = Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Debug.ActiveCfg = Universal Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Debug.Build.0 = Universal Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Release.ActiveCfg = Universal Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Release.Build.0 = Universal Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Unicode Debug.ActiveCfg = Universal Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Unicode Debug.Build.0 = Universal Unicode Debug|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Unicode Release.ActiveCfg = Universal Unicode Release|Win32
+		{AB48E704-A4A6-48D2-A295-C22B6D2C6ADB}.Universal Unicode Release.Build.0 = Universal Unicode Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj	2005-04-05 12:02:58 UTC (rev 1115)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.vcproj	2005-04-09 18:28:58 UTC (rev 1116)
@@ -22,7 +22,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="1"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;$(ProjectDir)\libdvdread&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;$(ProjectDir)\libdvdread&quot;;&quot;D:\Perso\Programmes\wxMSW-2.5.4\wxWidgets-2.5.4\include&quot;;&quot;D:\Perso\Programmes\wxMSW-2.5.4\wxWidgets-2.5.4\lib\vc_lib\mswud&quot;"
 				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;__WINDOWS__;__WXMSW__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
 				StringPooling="TRUE"
 				RuntimeLibrary="4"
@@ -87,8 +87,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;$(ProjectDir)\libdvdread&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__WXMSW__;DEBUG=1;__WXDEBUG__;__WIN95__;__WIN32__;WINVER=0x0400;STRICT"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)\win32&quot;;&quot;$(ProjectDir)\libdvdread&quot;;&quot;D:\Perso\Programmes\wxMSW-2.5.4\wxWidgets-2.5.4\include&quot;;&quot;D:\Perso\Programmes\wxMSW-2.5.4\wxWidgets-2.5.4\lib\vc_lib\mswud&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;DEBUG=1"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="3"
@@ -106,12 +106,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmswd.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib"
 				OutputFile=".\Debug/DvdMenuXtractor.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames="libcd.lib,libcid.lib,msvcrt.lib"
+				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile=".\Debug/DvdMenuXtractor.pdb"
 				SubSystem="2"
@@ -133,7 +133,8 @@
 			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"/>
+				Culture="1036"
+				AdditionalIncludeDirectories="&quot;D:\Perso\Programmes\wxMSW-2.5.4\wxWidgets-2.5.4\include&quot;"/>
 			<Tool
 				Name="VCWebServiceProxyGeneratorTool"/>
 			<Tool

Modified: trunk/DvdMenuXtractor/MyWizard.cpp
===================================================================
--- trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-05 12:02:58 UTC (rev 1115)
+++ trunk/DvdMenuXtractor/MyWizard.cpp	2005-04-09 18:28:58 UTC (rev 1116)
@@ -227,7 +227,7 @@
     {
         m_page->BeforeHide();
         m_page->Hide();
-        sizer->Remove(m_page);
+        sizer->Detach(m_page);
         m_page->AfterHide();
     }
 

Modified: trunk/DvdMenuXtractor/libdvdread/win32/libdvdread.vcproj
===================================================================
--- trunk/DvdMenuXtractor/libdvdread/win32/libdvdread.vcproj	2005-04-05 12:02:58 UTC (rev 1115)
+++ trunk/DvdMenuXtractor/libdvdread/win32/libdvdread.vcproj	2005-04-09 18:28:58 UTC (rev 1116)
@@ -138,6 +138,9 @@
 				RelativePath="..\dvdread\bswap.h">
 			</File>
 			<File
+				RelativePath=".\config.h">
+			</File>
+			<File
 				RelativePath=".\dirent.h">
 			</File>
 			<File
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.