]> Creatis software - bbtkGEditor.git/commitdiff
#3132 bbGEditor Feature New Normal - branch changeWx28to30 compilation with wxWidgets3
authorEduardo DAVILA <davila@localhost.localdomain>
Mon, 25 Sep 2017 11:29:56 +0000 (13:29 +0200)
committerEduardo DAVILA <davila@localhost.localdomain>
Mon, 25 Sep 2017 11:29:56 +0000 (13:29 +0200)
appli/bbEditor/bbEditor.cxx

index 517b72de9cb1c0d6271d07bae66da72a81a74906..497d60f5448c72282f07eee23ffc69146437d712 100644 (file)
@@ -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