X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=appli%2FbbEditor%2FbbEditor.cxx;fp=appli%2FbbEditor%2FbbEditor.cxx;h=497d60f5448c72282f07eee23ffc69146437d712;hb=4d9b612ea3b0eacb2cbc47d9b57affc96ddfa8c3;hp=517b72de9cb1c0d6271d07bae66da72a81a74906;hpb=646777bc9d888b3bbd295758266d9096818bfccc;p=bbtkGEditor.git diff --git a/appli/bbEditor/bbEditor.cxx b/appli/bbEditor/bbEditor.cxx index 517b72d..497d60f 100644 --- a/appli/bbEditor/bbEditor.cxx +++ b/appli/bbEditor/bbEditor.cxx @@ -54,13 +54,27 @@ protected: -static const wxCmdLineEntryDesc cmdLineDesc[] = -{ -{ wxCMD_LINE_PARAM, NULL, NULL, _T("file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, -{ wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("Prints this help") }, -//{ wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Message all 9") }, -{ wxCMD_LINE_NONE } -}; + +//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0 +#if wxMAJOR_VERSION <= 2 + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_PARAM, NULL, NULL, _T("file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("Prints this help") }, + //{ wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Message all 9") }, + { wxCMD_LINE_NONE } + }; +#else + static const wxCmdLineEntryDesc cmdLineDesc[] = + { + { wxCMD_LINE_PARAM, NULL, NULL, "file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, + { wxCMD_LINE_SWITCH, "h", "help", "Prints this help" }, + //{ wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Message all 9") }, + { wxCMD_LINE_NONE } + }; +#endif + + class wxBBEditorApp : public wxApp