made wxApp::argv an object convertible to either char** or wchar_t** for better compatibility with the existing ANSI code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -193,6 +193,7 @@ struct wxCmdLineParserData
|
||||
void SetArguments(int argc, char **argv);
|
||||
#if wxUSE_UNICODE
|
||||
void SetArguments(int argc, wxChar **argv);
|
||||
void SetArguments(int argc, const wxCmdLineArgsArray& argv);
|
||||
#endif // wxUSE_UNICODE
|
||||
void SetArguments(const wxString& cmdline);
|
||||
|
||||
@@ -240,6 +241,12 @@ void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
|
||||
}
|
||||
}
|
||||
|
||||
void wxCmdLineParserData::SetArguments(int WXUNUSED(argc),
|
||||
const wxCmdLineArgsArray& argv)
|
||||
{
|
||||
m_arguments = argv.GetArguments();
|
||||
}
|
||||
|
||||
#endif // wxUSE_UNICODE
|
||||
|
||||
void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
|
||||
@@ -310,6 +317,11 @@ void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
|
||||
m_data->SetArguments(argc, argv);
|
||||
}
|
||||
|
||||
void wxCmdLineParser::SetCmdLine(int argc, const wxCmdLineArgsArray& argv)
|
||||
{
|
||||
m_data->SetArguments(argc, argv);
|
||||
}
|
||||
|
||||
#endif // wxUSE_UNICODE
|
||||
|
||||
void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
|
||||
|
Reference in New Issue
Block a user