Unicode fixes to wxCmdLineParser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -100,20 +100,20 @@ public:
|
|||||||
|
|
||||||
// default ctor or ctor giving the cmd line in either Unix or Win form
|
// default ctor or ctor giving the cmd line in either Unix or Win form
|
||||||
wxCmdLineParser() { Init(); }
|
wxCmdLineParser() { Init(); }
|
||||||
wxCmdLineParser(int argc, char **argv) { Init(); SetCmdLine(argc, argv); }
|
wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }
|
||||||
wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); }
|
wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); }
|
||||||
|
|
||||||
// the same as above, but also gives the cmd line description - otherwise,
|
// the same as above, but also gives the cmd line description - otherwise,
|
||||||
// use AddXXX() later
|
// use AddXXX() later
|
||||||
wxCmdLineParser(const wxCmdLineEntryDesc *desc)
|
wxCmdLineParser(const wxCmdLineEntryDesc *desc)
|
||||||
{ Init(); SetDesc(desc); }
|
{ Init(); SetDesc(desc); }
|
||||||
wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, char **argv)
|
wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)
|
||||||
{ Init(); SetCmdLine(argc, argv); SetDesc(desc); }
|
{ Init(); SetCmdLine(argc, argv); SetDesc(desc); }
|
||||||
wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline)
|
wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline)
|
||||||
{ Init(); SetCmdLine(cmdline); SetDesc(desc); }
|
{ Init(); SetCmdLine(cmdline); SetDesc(desc); }
|
||||||
|
|
||||||
// set cmd line to parse after using one of the ctors which don't do it
|
// set cmd line to parse after using one of the ctors which don't do it
|
||||||
void SetCmdLine(int argc, char **argv);
|
void SetCmdLine(int argc, wxChar **argv);
|
||||||
void SetCmdLine(const wxString& cmdline);
|
void SetCmdLine(const wxString& cmdline);
|
||||||
|
|
||||||
// not virtual, don't use this class polymorphically
|
// not virtual, don't use this class polymorphically
|
||||||
|
@@ -160,7 +160,7 @@ struct wxCmdLineParserData
|
|||||||
|
|
||||||
// methods
|
// methods
|
||||||
wxCmdLineParserData();
|
wxCmdLineParserData();
|
||||||
void SetArguments(int argc, char **argv);
|
void SetArguments(int argc, wxChar **argv);
|
||||||
void SetArguments(const wxString& cmdline);
|
void SetArguments(const wxString& cmdline);
|
||||||
|
|
||||||
int FindOption(const wxString& name);
|
int FindOption(const wxString& name);
|
||||||
@@ -185,7 +185,7 @@ wxCmdLineParserData::wxCmdLineParserData()
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxCmdLineParserData::SetArguments(int argc, char **argv)
|
void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
|
||||||
{
|
{
|
||||||
m_arguments.Empty();
|
m_arguments.Empty();
|
||||||
|
|
||||||
@@ -283,7 +283,7 @@ void wxCmdLineParser::Init()
|
|||||||
m_data = new wxCmdLineParserData;
|
m_data = new wxCmdLineParserData;
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxCmdLineParser::SetCmdLine(int argc, char **argv)
|
void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
|
||||||
{
|
{
|
||||||
m_data->SetArguments(argc, argv);
|
m_data->SetArguments(argc, argv);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user