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.
This commit is contained in:
Thomas Goyne 2010-02-09 04:31:33 +00:00
parent cb8cafadbd
commit c9ba8329ad
4 changed files with 5 additions and 5 deletions

View File

@ -237,7 +237,7 @@
#include <GL/glu.h> #include <GL/glu.h>
#endif #endif
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS_DEFINED
#undef _CRT_SECURE_NO_WARNINGS #undef _CRT_SECURE_NO_WARNINGS
#endif #endif

View File

@ -118,7 +118,7 @@ DialogFontsCollector::DialogFontsCollector(wxWindow *parent)
choices.Add(_("Copy fonts to folder")); choices.Add(_("Copy fonts to folder"));
choices.Add(_("Copy fonts to zipped archive")); choices.Add(_("Copy fonts to zipped archive"));
choices.Add(_("Attach fonts to current subtitles")); choices.Add(_("Attach fonts to current subtitles"));
#ifdef __WXDEBUG__ #ifdef _DEBUG
choices.Add(_("DEBUG: Verify all fonts in system")); choices.Add(_("DEBUG: Verify all fonts in system"));
#endif #endif
CollectAction = new wxRadioBox(this,RADIO_BOX,_T("Action"),wxDefaultPosition,wxDefaultSize,choices,1); CollectAction = new wxRadioBox(this,RADIO_BOX,_T("Action"),wxDefaultPosition,wxDefaultSize,choices,1);

View File

@ -48,7 +48,7 @@
///////////// /////////////
// wxWidgets // wxWidgets
#if wxCHECK_VERSION(2, 9, 0) #if wxCHECK_VERSION(2, 9, 0)
#ifdef __WXDEBUG__ #ifdef _DEBUG
#pragma comment(lib, "wxzlibd.lib") #pragma comment(lib, "wxzlibd.lib")
#pragma comment(lib, "wxpngd.lib") #pragma comment(lib, "wxpngd.lib")
#pragma comment(lib, "wxregexud.lib") #pragma comment(lib, "wxregexud.lib")
@ -122,7 +122,7 @@
///////////// /////////////
// FreeType2 // FreeType2
#ifdef WITH_FREETYPE2 #ifdef WITH_FREETYPE2
#ifdef __WXDEBUG__ #ifdef _DEBUG
#ifdef FT2_LIB_DEBUG #ifdef FT2_LIB_DEBUG
#pragma comment(lib,FT2_LIB_DEBUG) #pragma comment(lib,FT2_LIB_DEBUG)
#endif #endif

View File

@ -160,7 +160,7 @@ void SubtitleFormat::LoadFormats () {
new MKVSubtitleFormat(); new MKVSubtitleFormat();
new EncoreSubtitleFormat(); new EncoreSubtitleFormat();
new TranStationSubtitleFormat(); new TranStationSubtitleFormat();
#ifdef __WXDEBUG__ #ifdef _DEBUG
new DVDSubtitleFormat(); new DVDSubtitleFormat();
#endif #endif
} }