1. added wfstream.cpp to wxBase (needed by filesys.cpp)
2. small enchancements in wxCmdLineParser (handles "help" options correctly) 3. use wxCmdLineParser in makegen git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -142,8 +142,8 @@ struct wxCmdLineParserData
|
||||
{
|
||||
// options
|
||||
wxString m_switchChars; // characters which may start an option
|
||||
|
||||
bool m_enableLongOptions; // TRUE if long options are enabled
|
||||
wxString m_logo; // some extra text to show in Usage()
|
||||
|
||||
// cmd line data
|
||||
wxArrayString m_arguments; // == argv, argc == m_arguments.GetCount()
|
||||
@@ -264,6 +264,11 @@ void wxCmdLineParser::EnableLongOptions(bool enable)
|
||||
m_data->m_enableLongOptions = enable;
|
||||
}
|
||||
|
||||
void wxCmdLineParser::SetLogo(const wxString& logo)
|
||||
{
|
||||
m_data->m_logo = logo;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// command line construction
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -275,7 +280,8 @@ void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc)
|
||||
switch ( desc->kind )
|
||||
{
|
||||
case wxCMD_LINE_SWITCH:
|
||||
AddSwitch(desc->shortName, desc->longName, desc->description);
|
||||
AddSwitch(desc->shortName, desc->longName, desc->description,
|
||||
desc->flags);
|
||||
break;
|
||||
|
||||
case wxCMD_LINE_OPTION:
|
||||
@@ -842,6 +848,11 @@ void wxCmdLineParser::Usage()
|
||||
}
|
||||
}
|
||||
|
||||
if ( !!m_data->m_logo )
|
||||
{
|
||||
wxLogMessage(m_data->m_logo);
|
||||
}
|
||||
|
||||
wxLogMessage(brief);
|
||||
wxLogMessage(detailed);
|
||||
}
|
||||
|
Reference in New Issue
Block a user