diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-15 01:01:12 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-15 01:01:12 +0000 |
| commit | 0b781dd65a90e617866810ecb3dee27267449f1f (patch) | |
| tree | ab79f468e93e6093d45c4e9e49c9e3dccad0e6ed /src/tools | |
| parent | 2247247a5294af70890cf68f3f9be930f3729d95 (diff) | |
| parent | 83afdbcfe5d36a64d945843396ddadd22ea4691b (diff) | |
Merge branch 'master' into speed-up
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 88c03d753..993c41563 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -361,11 +361,19 @@ public: } }; +#if wxMINOR_VERSION == 9 +static const wxCmdLineEntryDesc command_line_description[] = { + { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_PARAM, 0, 0, "film to load", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_NONE } +}; +#else static const wxCmdLineEntryDesc command_line_description[] = { { wxCMD_LINE_OPTION, wxT("l"), wxT("log"), wxT("set log level (silent, verbose or timing)"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_PARAM, 0, 0, wxT("film to load"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL }, { wxCMD_LINE_NONE } }; +#endif class App : public wxApp { |