Merge commit 'a259baa' into 0.6.0.x

This commit is contained in:
Luke Dashjr
2012-08-26 22:15:56 +00:00
5 changed files with 18 additions and 9 deletions

View File

@@ -257,7 +257,7 @@ bool AppInit2(int argc, char* argv[])
// Remove tabs
strUsage.erase(std::remove(strUsage.begin(), strUsage.end(), '\t'), strUsage.end());
#if defined(QT_GUI) && defined(WIN32)
// On windows, show a message box, as there is no stderr
// On Windows, show a message box, as there is no stderr
wxMessageBox(strUsage, "Usage");
#else
fprintf(stderr, "%s", strUsage.c_str());