From 42599b710de7d49fdc9bd9219333daf46c51f508 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Sep 2007 23:41:56 +0000 Subject: [PATCH] change wxCmdLineEntryDesc::short/longName type to wxString for better compatibility with existing Unicode code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/cmdlpars.tex | 6 +++--- include/wx/cmdline.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/latex/wx/cmdlpars.tex b/docs/latex/wx/cmdlpars.tex index 46119ef6d1..f5b21d36a8 100644 --- a/docs/latex/wx/cmdlpars.tex +++ b/docs/latex/wx/cmdlpars.tex @@ -69,8 +69,8 @@ this structure: struct wxCmdLineEntryDesc { wxCmdLineEntryType kind; - const char *shortName; - const char *longName; + wxString shortName; + wxString longName; wxString description; wxCmdLineParamType type; int flags; @@ -93,7 +93,7 @@ enum wxCmdLineEntryType } The field {\tt shortName} is the usual, short, name of the switch or the option. -{\tt longName} is the corresponding long name or NULL if the option has no long +{\tt longName} is the corresponding long name or empty if the option has no long name. Both of these fields are unused for the parameters. Both the short and long option names can contain only letters, digits and the underscores. diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h index c9dd72b9d2..fc5726d1da 100644 --- a/include/wx/cmdline.h +++ b/include/wx/cmdline.h @@ -64,8 +64,8 @@ enum wxCmdLineEntryType struct wxCmdLineEntryDesc { wxCmdLineEntryType kind; - const char *shortName; - const char *longName; + wxString shortName; + wxString longName; wxString description; wxCmdLineParamType type; int flags; -- 2.45.2