add a critical section protecting ms_prev variables (replaces patch 1819224)

[wxWidgets.git] / include / wx / cmdline.h

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index fc5726d1da960f1eca937aa537b03f85fc3f2187..88ce4e51d311075eb52af7de540b1e34c1363b52 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -64,13 +64,17 @@ enum wxCmdLineEntryType
 struct wxCmdLineEntryDesc
 {
     wxCmdLineEntryType kind;
-    wxString shortName;
-    wxString longName;
-    wxString description;
+    const char *shortName;
+    const char *longName;
+    const char *description;
     wxCmdLineParamType type;
     int flags;
 };
 
+// the list of wxCmdLineEntryDesc objects should be terminated with this one
+#define wxCMD_LINE_DESC_END \
+        { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0x0 }
+
 // ----------------------------------------------------------------------------
 // wxCmdLineParser is a class for parsing command line.
 //