amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added some ifdefs around the vc9 fixes so that mse still compiles with msvc7 and wxWidget 2.6

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1568 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2010-12-30 16:50:20 +00:00
parent 70471251e4
commit 809d9b747a
6 changed files with 30 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+2 -2
View File
@@ -51,7 +51,7 @@ class MSE : public wxApp {
/// Hack around some wxWidget idiocies
int FilterEvent(wxEvent& ev);
/// Fancier assert
#if defined(_MSC_VER) && defined(_DEBUG)
#if defined(_MSC_VER) && defined(_DEBUG) && defined(_CRT_WIDE)
void OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg);
#endif
};
@@ -275,7 +275,7 @@ void MSE::HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& even
} CATCH_ALL_ERRORS(true);
}
#if defined(_MSC_VER) && defined(_DEBUG)
#if defined(_MSC_VER) && defined(_DEBUG) && defined(_CRT_WIDE)
// Print assert failures to debug output
void MSE::OnAssert(const wxChar *file, int line, const wxChar *cond, const wxChar *msg) {
#ifdef UNICODE