diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-13 21:51:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-13 21:51:26 +0000 |
| commit | 4dd30112e54a59d9b14e9485725edf1d2bf1e169 (patch) | |
| tree | 38118f82164c8003571b4a7aa8f584a66699bc3a /src | |
| parent | 438db1bc912a14bbab39f6ea7aea1b6a7947b7d0 (diff) | |
| parent | 817cc13e71a667411283b577ca823b29e19a167f (diff) | |
Fix merge.
Diffstat (limited to 'src')
| -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 { |