From ac33243a4955ca993c1ab3774950ce82886963d9 Mon Sep 17 00:00:00 2001
From: harukalover <harukalover@aegisub.org>
Date: Wed, 22 Jul 2009 19:52:59 +0000
Subject: [PATCH] Fixed compilation with wxWidgets 2.9.0 again plus removed
 some unneeded #if's (wc_str is the same as c_str under 2.8)

Originally committed to SVN as r3191.
---
 aegisub/src/audio_provider.cpp         |  4 ----
 aegisub/src/ffmpegsource_common.cpp    |  4 ----
 aegisub/src/video_provider_manager.cpp | 10 +---------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp
index 8bf8b4600..728979229 100644
--- a/aegisub/src/audio_provider.cpp
+++ b/aegisub/src/audio_provider.cpp
@@ -229,11 +229,7 @@ AudioProvider *AudioProviderFactoryManager::GetAudioProvider(wxString filename,
 	wxString error;
 	for (unsigned int i=0;i<list.Count();i++) {
 		try {
-#if wxCHECK_VERSION(2,9,0)
 			AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.wc_str());
-#else
-			AudioProvider *prov = GetFactory(list[i])->CreateProvider(filename.c_str());
-#endif
 			if (prov) {
 				provider = prov;
 				break;
diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp
index a39e09cb5..3080e84b9 100644
--- a/aegisub/src/ffmpegsource_common.cpp
+++ b/aegisub/src/ffmpegsource_common.cpp
@@ -166,11 +166,7 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& filename)
 	md5_state_t state;
 	md5_byte_t digest[16];
 	md5_init(&state);
-#if wxCHECK_VERSION(2,9,0)
 	md5_append(&state,(md5_byte_t*)toHash.wc_str(),toHash.Length()*sizeof(wxChar));
-#else
-	md5_append(&state,(md5_byte_t*)toHash.c_str(),toHash.Length()*sizeof(wxChar));
-#endif
 	md5_finish(&state,digest);
 
 	// Generate the filename
diff --git a/aegisub/src/video_provider_manager.cpp b/aegisub/src/video_provider_manager.cpp
index 277d6b539..fed14aa83 100644
--- a/aegisub/src/video_provider_manager.cpp
+++ b/aegisub/src/video_provider_manager.cpp
@@ -64,15 +64,11 @@
 VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
 	// First check special case of dummy video
 	if (video.StartsWith(_T("?dummy:"))) {
-#if wxCHECK_VERSION(2,9,0)
 		return new DummyVideoProvider(video.wc_str());
-#else
-		return new DummyVideoProvider(video.c_str());
-#endif
 	}
 
 	try {
-		VideoProvider *y4m_provider = new YUV4MPEGVideoProvider(video.c_str());
+		VideoProvider *y4m_provider = new YUV4MPEGVideoProvider(video.wc_str());
 		if (y4m_provider)
 			y4m_provider = new VideoProviderCache(y4m_provider);
 		return y4m_provider;
@@ -95,11 +91,7 @@ VideoProvider *VideoProviderFactoryManager::GetProvider(wxString video) {
 	for (unsigned int i=0;i<list.Count();i++) {
 		try {
 			// Create provider
-#if wxCHECK_VERSION(2,9,0)
 			VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.wc_str());
-#else
-			VideoProvider *provider = GetFactory(list[i])->CreateProvider(video.c_str());
-#endif
 			if (provider) {
 				// Cache if necessary
 				if (provider->GetDesiredCacheSize()) {