projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correctly determine best wxPropertyGrid width.
[wxWidgets.git]
/
src
/
common
/
cmdline.cpp
diff --git
a/src/common/cmdline.cpp
b/src/common/cmdline.cpp
index 95afbfe27f0b262814fffb0e21e40fb1bacb4f75..e8058e297996081cbfe79f894147c349dcd18c86 100644
(file)
--- a/
src/common/cmdline.cpp
+++ b/
src/common/cmdline.cpp
@@
-74,7
+74,6
@@
struct wxCmdLineOption
int fl)
{
// wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty
int fl)
{
// wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty
- #ifdef __WXDEBUG__
if ( k != wxCMD_LINE_USAGE_TEXT )
{
wxASSERT_MSG
if ( k != wxCMD_LINE_USAGE_TEXT )
{
wxASSERT_MSG
@@
-95,8
+94,6
@@
struct wxCmdLineOption
wxT("Long option contains invalid characters")
);
}
wxT("Long option contains invalid characters")
);
}
- #endif // __WXDEBUG__
-
kind = k;
kind = k;
@@
-117,7
+114,7
@@
struct wxCmdLineOption
void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
{
void Check(wxCmdLineParamType WXUNUSED_UNLESS_DEBUG(typ)) const
{
- wxASSERT_MSG( type == typ,
_
T("type mismatch in wxCmdLineOption") );
+ wxASSERT_MSG( type == typ,
wx
T("type mismatch in wxCmdLineOption") );
}
double GetDoubleVal() const
}
double GetDoubleVal() const
@@
-227,9
+224,9
@@
wxCmdLineParserData::wxCmdLineParserData()
{
m_enableLongOptions = true;
#ifdef __UNIX_LIKE__
{
m_enableLongOptions = true;
#ifdef __UNIX_LIKE__
- m_switchChars =
_
T("-");
+ m_switchChars =
wx
T("-");
#else // !Unix
#else // !Unix
- m_switchChars =
_
T("/-");
+ m_switchChars =
wx
T("/-");
#endif
}
#endif
}
@@
-404,7
+401,7
@@
void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc)
break;
default:
break;
default:
- wxFAIL_MSG(
_
T("unknown command line entry type") );
+ wxFAIL_MSG(
wx
T("unknown command line entry type") );
// still fall through
case wxCMD_LINE_NONE:
// still fall through
case wxCMD_LINE_NONE:
@@
-419,7
+416,7
@@
void wxCmdLineParser::AddSwitch(const wxString& shortName,
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
-
_
T("duplicate switch") );
+
wx
T("duplicate switch") );
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH,
shortName, longName, desc,
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_SWITCH,
shortName, longName, desc,
@@
-435,7
+432,7
@@
void wxCmdLineParser::AddOption(const wxString& shortName,
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
int flags)
{
wxASSERT_MSG( m_data->FindOption(shortName) == wxNOT_FOUND,
-
_
T("duplicate option") );
+
wx
T("duplicate option") );
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION,
shortName, longName, desc,
wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_OPTION,
shortName, longName, desc,
@@
-450,21
+447,21
@@
void wxCmdLineParser::AddParam(const wxString& desc,
{
// do some consistency checks: a required parameter can't follow an
// optional one and nothing should follow a parameter with MULTIPLE flag
{
// do some consistency checks: a required parameter can't follow an
// optional one and nothing should follow a parameter with MULTIPLE flag
-#if
def __WXDEBUG__
+#if
wxDEBUG_LEVEL
if ( !m_data->m_paramDesc.IsEmpty() )
{
wxCmdLineParam& param = m_data->m_paramDesc.Last();
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
if ( !m_data->m_paramDesc.IsEmpty() )
{
wxCmdLineParam& param = m_data->m_paramDesc.Last();
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE),
-
_
T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
+
wx
T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style will be ignored") );
if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
if ( !(flags & wxCMD_LINE_PARAM_OPTIONAL) )
{
wxASSERT_MSG( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL),
-
_
T("a required parameter can't follow an optional one") );
+
wx
T("a required parameter can't follow an optional one") );
}
}
}
}
-#endif //
Debug
+#endif //
wxDEBUG_LEVEL
wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
wxCmdLineParam *param = new wxCmdLineParam(desc, type, flags);
@@
-492,7
+489,7
@@
bool wxCmdLineParser::Found(const wxString& name) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false,
_
T("unknown switch") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false,
wx
T("unknown switch") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
@@
-507,13
+504,13
@@
bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false,
_
T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false,
wx
T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
- wxCHECK_MSG( value, false,
_
T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false,
wx
T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetStrVal();
*value = opt.GetStrVal();
@@
-526,13
+523,13
@@
bool wxCmdLineParser::Found(const wxString& name, long *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false,
_
T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false,
wx
T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
- wxCHECK_MSG( value, false,
_
T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false,
wx
T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetLongVal();
*value = opt.GetLongVal();
@@
-545,13
+542,13
@@
bool wxCmdLineParser::Found(const wxString& name, double *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false,
_
T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false,
wx
T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
- wxCHECK_MSG( value, false,
_
T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false,
wx
T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetDoubleVal();
*value = opt.GetDoubleVal();
@@
-565,13
+562,13
@@
bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
if ( i == wxNOT_FOUND )
i = m_data->FindOptionByLongName(name);
- wxCHECK_MSG( i != wxNOT_FOUND, false,
_
T("unknown option") );
+ wxCHECK_MSG( i != wxNOT_FOUND, false,
wx
T("unknown option") );
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
wxCmdLineOption& opt = m_data->m_options[(size_t)i];
if ( !opt.HasValue() )
return false;
- wxCHECK_MSG( value, false,
_
T("NULL pointer in wxCmdLineOption::Found") );
+ wxCHECK_MSG( value, false,
wx
T("NULL pointer in wxCmdLineOption::Found") );
*value = opt.GetDateVal();
*value = opt.GetDateVal();
@@
-586,7
+583,7
@@
size_t wxCmdLineParser::GetParamCount() const
wxString wxCmdLineParser::GetParam(size_t n) const
{
wxString wxCmdLineParser::GetParam(size_t n) const
{
- wxCHECK_MSG( n < GetParamCount(), wxEmptyString,
_
T("invalid param index") );
+ wxCHECK_MSG( n < GetParamCount(), wxEmptyString,
wx
T("invalid param index") );
return m_data->m_parameters[n];
}
return m_data->m_parameters[n];
}
@@
-630,7
+627,7
@@
int wxCmdLineParser::Parse(bool showUsage)
// special case: "--" should be discarded and all following arguments
// should be considered as parameters, even if they start with '-' and
// not like options (this is POSIX-like)
// special case: "--" should be discarded and all following arguments
// should be considered as parameters, even if they start with '-' and
// not like options (this is POSIX-like)
- if ( arg ==
_
T("--") )
+ if ( arg ==
wx
T("--") )
{
maybeOption = false;
{
maybeOption = false;
@@
-647,7
+644,7
@@
int wxCmdLineParser::Parse(bool showUsage)
int optInd = wxNOT_FOUND; // init to suppress warnings
// an option or a switch: find whether it's a long or a short one
int optInd = wxNOT_FOUND; // init to suppress warnings
// an option or a switch: find whether it's a long or a short one
- if ( arg.length() >= 3 && arg[0u] ==
_T('-') && arg[1u] == _
T('-') )
+ if ( arg.length() >= 3 && arg[0u] ==
wxT('-') && arg[1u] == wx
T('-') )
{
// a long one
isLong = true;
{
// a long one
isLong = true;
@@
-665,7
+662,7
@@
int wxCmdLineParser::Parse(bool showUsage)
if ( optInd == wxNOT_FOUND )
{
errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
if ( optInd == wxNOT_FOUND )
{
errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
}
}
else
}
}
else
@@
-675,7
+672,7
@@
int wxCmdLineParser::Parse(bool showUsage)
// Print the argument including leading "--"
name.Prepend( wxT("--") );
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
// Print the argument including leading "--"
name.Prepend( wxT("--") );
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
}
}
}
}
@@
-697,7
+694,7
@@
int wxCmdLineParser::Parse(bool showUsage)
// we couldn't find a valid option name in the
// beginning of this string
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
// we couldn't find a valid option name in the
// beginning of this string
errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
break;
}
break;
}
@@
-760,7
+757,7
@@
int wxCmdLineParser::Parse(bool showUsage)
if ( p != arg.end() )
{
errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
if ( p != arg.end() )
{
errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
else // no value, as expected
ok = false;
}
else // no value, as expected
@@
-794,7
+791,7
@@
int wxCmdLineParser::Parse(bool showUsage)
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
name.c_str())
// ... but there is none
errorMsg << wxString::Format(_("Option '%s' requires a value."),
name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-813,7
+810,7
@@
int wxCmdLineParser::Parse(bool showUsage)
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
name.c_str())
{
errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-825,7
+822,7
@@
int wxCmdLineParser::Parse(bool showUsage)
switch ( opt.type )
{
default:
switch ( opt.type )
{
default:
- wxFAIL_MSG(
_
T("unknown option type") );
+ wxFAIL_MSG(
wx
T("unknown option type") );
// still fall through
case wxCMD_LINE_VAL_STRING:
// still fall through
case wxCMD_LINE_VAL_STRING:
@@
-843,7
+840,7
@@
int wxCmdLineParser::Parse(bool showUsage)
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-861,7
+858,7
@@
int wxCmdLineParser::Parse(bool showUsage)
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
{
errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
value.c_str(), name.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-872,12
+869,12
@@
int wxCmdLineParser::Parse(bool showUsage)
case wxCMD_LINE_VAL_DATE:
{
wxDateTime dt;
case wxCMD_LINE_VAL_DATE:
{
wxDateTime dt;
-
const char *res = dt.ParseDate(value)
;
- if ( !
res || *res
)
+
wxString::const_iterator end
;
+ if ( !
dt.ParseDate(value, &end) || end != value.end()
)
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str())
{
errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
name.c_str(), value.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-909,7
+906,7
@@
int wxCmdLineParser::Parse(bool showUsage)
else
{
wxASSERT_MSG( currentParam == countParam - 1,
else
{
wxASSERT_MSG( currentParam == countParam - 1,
-
_
T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
+
wx
T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
// remember that we did have this last repeatable parameter
hadRepeatableParam = true;
// remember that we did have this last repeatable parameter
hadRepeatableParam = true;
@@
-918,7
+915,7
@@
int wxCmdLineParser::Parse(bool showUsage)
else
{
errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
else
{
errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-956,7
+953,7
@@
int wxCmdLineParser::Parse(bool showUsage)
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
optName.c_str())
errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
optName.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-978,7
+975,7
@@
int wxCmdLineParser::Parse(bool showUsage)
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
param.description.c_str())
{
errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
param.description.c_str())
- <<
_
T('\n');
+ <<
wx
T('\n');
ok = false;
}
ok = false;
}
@@
-1000,7
+997,7
@@
int wxCmdLineParser::Parse(bool showUsage)
}
else
{
}
else
{
- wxFAIL_MSG(
_
T("no wxMessageOutput object?") );
+ wxFAIL_MSG(
wx
T("no wxMessageOutput object?") );
}
}
}
}
@@
-1020,7
+1017,7
@@
void wxCmdLineParser::Usage() const
}
else
{
}
else
{
- wxFAIL_MSG(
_
T("no wxMessageOutput object?") );
+ wxFAIL_MSG(
wx
T("no wxMessageOutput object?") );
}
}
}
}
@@
-1045,14
+1042,14
@@
wxString wxCmdLineParser::GetUsageString() const
if ( !m_data->m_logo.empty() )
{
if ( !m_data->m_logo.empty() )
{
- usage << m_data->m_logo <<
_
T('\n');
+ usage << m_data->m_logo <<
wx
T('\n');
}
usage << wxString::Format(_("Usage: %s"), appname.c_str());
// the switch char is usually '-' but this can be changed with
// SetSwitchChars() and then the first one of possible chars is used
}
usage << wxString::Format(_("Usage: %s"), appname.c_str());
// the switch char is usually '-' but this can be changed with
// SetSwitchChars() and then the first one of possible chars is used
- wxChar chSwitch = !m_data->m_switchChars ?
_
T('-')
+ wxChar chSwitch = !m_data->m_switchChars ?
wx
T('-')
: m_data->m_switchChars[0u];
bool areLongOptionsEnabled = AreLongOptionsEnabled();
: m_data->m_switchChars[0u];
bool areLongOptionsEnabled = AreLongOptionsEnabled();
@@
-1064,10
+1061,10
@@
wxString wxCmdLineParser::GetUsageString() const
if ( opt.kind != wxCMD_LINE_USAGE_TEXT )
{
if ( opt.kind != wxCMD_LINE_USAGE_TEXT )
{
- usage <<
_
T(' ');
+ usage <<
wx
T(' ');
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- usage <<
_
T('[');
+ usage <<
wx
T('[');
}
if ( !opt.shortName.empty() )
}
if ( !opt.shortName.empty() )
@@
-1076,7
+1073,7
@@
wxString wxCmdLineParser::GetUsageString() const
}
else if ( areLongOptionsEnabled && !opt.longName.empty() )
{
}
else if ( areLongOptionsEnabled && !opt.longName.empty() )
{
- usage <<
_
T("--") << opt.longName;
+ usage <<
wx
T("--") << opt.longName;
}
else
{
}
else
{
@@
-1087,32
+1084,32
@@
wxString wxCmdLineParser::GetUsageString() const
}
else
{
}
else
{
- wxFAIL_MSG(
_
T("option without neither short nor long name") );
+ wxFAIL_MSG(
wx
T("option without neither short nor long name") );
}
}
if ( !opt.shortName.empty() )
{
}
}
if ( !opt.shortName.empty() )
{
- option <<
_
T(" ") << chSwitch << opt.shortName;
+ option <<
wx
T(" ") << chSwitch << opt.shortName;
}
if ( areLongOptionsEnabled && !opt.longName.empty() )
{
}
if ( areLongOptionsEnabled && !opt.longName.empty() )
{
- option << (option.empty() ?
_T(" ") : _
T(", "))
- <<
_
T("--") << opt.longName;
+ option << (option.empty() ?
wxT(" ") : wx
T(", "))
+ <<
wx
T("--") << opt.longName;
}
if ( opt.kind != wxCMD_LINE_SWITCH )
{
wxString val;
}
if ( opt.kind != wxCMD_LINE_SWITCH )
{
wxString val;
- val <<
_T('<') << GetTypeName(opt.type) << _
T('>');
- usage <<
_
T(' ') << val;
- option << (!opt.longName ?
_T(':') : _
T('=')) << val;
+ val <<
wxT('<') << GetTypeName(opt.type) << wx
T('>');
+ usage <<
wx
T(' ') << val;
+ option << (!opt.longName ?
wxT(':') : wx
T('=')) << val;
}
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
}
if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
{
- usage <<
_
T(']');
+ usage <<
wx
T(']');
}
}
}
}
@@
-1125,26
+1122,26
@@
wxString wxCmdLineParser::GetUsageString() const
{
wxCmdLineParam& param = m_data->m_paramDesc[n];
{
wxCmdLineParam& param = m_data->m_paramDesc[n];
- usage <<
_
T(' ');
+ usage <<
wx
T(' ');
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- usage <<
_
T('[');
+ usage <<
wx
T('[');
}
usage << param.description;
if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
{
}
usage << param.description;
if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
{
- usage <<
_
T("...");
+ usage <<
wx
T("...");
}
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
}
if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
{
- usage <<
_
T(']');
+ usage <<
wx
T(']');
}
}
}
}
- usage <<
_
T('\n');
+ usage <<
wx
T('\n');
// set to number of our own options, not counting the standard ones
count = namesOptions.size();
// set to number of our own options, not counting the standard ones
count = namesOptions.size();
@@
-1167,20
+1164,20
@@
wxString wxCmdLineParser::GetUsageString() const
for ( n = 0; n < namesOptions.size(); n++ )
{
if ( n == count )
for ( n = 0; n < namesOptions.size(); n++ )
{
if ( n == count )
- usage <<
_
T('\n') << stdDesc;
+ usage <<
wx
T('\n') << stdDesc;
len = namesOptions[n].length();
// desc contains text if name is empty
if (len == 0)
{
len = namesOptions[n].length();
// desc contains text if name is empty
if (len == 0)
{
- usage << descOptions[n] <<
_
T('\n');
+ usage << descOptions[n] <<
wx
T('\n');
}
else
{
usage << namesOptions[n]
}
else
{
usage << namesOptions[n]
- << wxString(
_T(' '), lenMax - len) << _
T('\t')
+ << wxString(
wxT(' '), lenMax - len) << wx
T('\t')
<< descOptions[n]
<< descOptions[n]
- <<
_
T('\n');
+ <<
wx
T('\n');
}
}
}
}
@@
-1197,7
+1194,7
@@
static wxString GetTypeName(wxCmdLineParamType type)
switch ( type )
{
default:
switch ( type )
{
default:
- wxFAIL_MSG(
_
T("unknown option type") );
+ wxFAIL_MSG(
wx
T("unknown option type") );
// still fall through
case wxCMD_LINE_VAL_STRING:
// still fall through
case wxCMD_LINE_VAL_STRING:
@@
-1332,7
+1329,7
@@
wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline,
break;
}
break;
}
- lastBS = ch == '\\';
+ lastBS =
!lastBS &&
ch == '\\';
}
else // type == wxCMD_LINE_SPLIT_UNIX
{
}
else // type == wxCMD_LINE_SPLIT_UNIX
{
projects / wxWidgets.git / blobdiff