From c9ba8329adf34c5966daea8c99225cf96b73392c Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Tue, 9 Feb 2010 04:31:33 +0000
Subject: [PATCH] Change all incorrect uses of __WXDEBUG__ to _DEBUG.
 __WXDEBUG__ being defined does not necessarily mean that it is a debug build,
 and by default it is defined in release builds of wx as of 2.9.1.

Originally committed to SVN as r4089.
---
 aegisub/src/agi_pre.h                  | 2 +-
 aegisub/src/dialog_fonts_collector.cpp | 2 +-
 aegisub/src/setup.cpp                  | 4 ++--
 aegisub/src/subtitle_format.cpp        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aegisub/src/agi_pre.h b/aegisub/src/agi_pre.h
index a13c94bcf..698ee5fc3 100644
--- a/aegisub/src/agi_pre.h
+++ b/aegisub/src/agi_pre.h
@@ -237,7 +237,7 @@
 #include <GL/glu.h>
 #endif
 
-#ifndef _CRT_SECURE_NO_WARNINGS
+#ifndef _CRT_SECURE_NO_WARNINGS_DEFINED
 #undef _CRT_SECURE_NO_WARNINGS
 #endif
 
diff --git a/aegisub/src/dialog_fonts_collector.cpp b/aegisub/src/dialog_fonts_collector.cpp
index 259d18d22..3a4becb62 100644
--- a/aegisub/src/dialog_fonts_collector.cpp
+++ b/aegisub/src/dialog_fonts_collector.cpp
@@ -118,7 +118,7 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
 	choices.Add(_("Copy fonts to folder"));
 	choices.Add(_("Copy fonts to zipped archive"));
 	choices.Add(_("Attach fonts to current subtitles"));
-#ifdef __WXDEBUG__
+#ifdef _DEBUG
 	choices.Add(_("DEBUG: Verify all fonts in system"));
 #endif
 	CollectAction = new wxRadioBox(this,RADIO_BOX,_T("Action"),wxDefaultPosition,wxDefaultSize,choices,1);
diff --git a/aegisub/src/setup.cpp b/aegisub/src/setup.cpp
index 1f147ab29..d657a7abe 100644
--- a/aegisub/src/setup.cpp
+++ b/aegisub/src/setup.cpp
@@ -48,7 +48,7 @@
 /////////////
 // wxWidgets
 #if wxCHECK_VERSION(2, 9, 0)
-#ifdef __WXDEBUG__
+#ifdef _DEBUG
 #pragma comment(lib, "wxzlibd.lib")
 #pragma comment(lib, "wxpngd.lib")
 #pragma comment(lib, "wxregexud.lib")
@@ -122,7 +122,7 @@
 /////////////
 // FreeType2
 #ifdef WITH_FREETYPE2
-#ifdef __WXDEBUG__
+#ifdef _DEBUG
 #ifdef FT2_LIB_DEBUG
 #pragma comment(lib,FT2_LIB_DEBUG)
 #endif
diff --git a/aegisub/src/subtitle_format.cpp b/aegisub/src/subtitle_format.cpp
index efbdc4563..c44bde706 100644
--- a/aegisub/src/subtitle_format.cpp
+++ b/aegisub/src/subtitle_format.cpp
@@ -160,7 +160,7 @@ void SubtitleFormat::LoadFormats () {
 		new MKVSubtitleFormat();
 		new EncoreSubtitleFormat();
 		new TranStationSubtitleFormat();
-#ifdef __WXDEBUG__
+#ifdef _DEBUG
 		new DVDSubtitleFormat();
 #endif
 	}