applied SF patch # 826838 to fix removal of -psn_* command line argument
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -174,10 +174,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
if ( argc > 1 )
|
||||
{
|
||||
static const wxChar *ARG_PSN = _T("-psn_");
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
|
||||
{
|
||||
// remove this argument
|
||||
memmove(argv, argv + 1, argc--);
|
||||
--argc;
|
||||
memmove(argv + 1, argv + 2, argc * sizeof(char *));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -609,10 +609,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
if ( argc > 1 )
|
||||
{
|
||||
static const wxChar *ARG_PSN = _T("-psn_");
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
|
||||
{
|
||||
// remove this argument
|
||||
memmove(argv, argv + 1, argc--);
|
||||
--argc;
|
||||
memmove(argv + 1, argv + 2, argc * sizeof(char *));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -609,10 +609,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
|
||||
if ( argc > 1 )
|
||||
{
|
||||
static const wxChar *ARG_PSN = _T("-psn_");
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, sizeof(ARG_PSN) - 1) == 0 )
|
||||
if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
|
||||
{
|
||||
// remove this argument
|
||||
memmove(argv, argv + 1, argc--);
|
||||
--argc;
|
||||
memmove(argv + 1, argv + 2, argc * sizeof(char *));
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user