Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied SF patch # 826838 to fix removal of -psn_* command line argument

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2003-10-21 20:22:34 +00:00
parent c2149c93d5
commit 33f39af3b0
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/cocoa/app.mm
View File

@@ -174,10 +174,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
if ( argc > 1 ) if ( argc > 1 )
{ {
static const wxChar *ARG_PSN = _T("-psn_"); 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 // remove this argument
memmove(argv, argv + 1, argc--); --argc;
memmove(argv + 1, argv + 2, argc * sizeof(char *));
} }
} }

5
src/mac/app.cpp
View File

@@ -609,10 +609,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
if ( argc > 1 ) if ( argc > 1 )
{ {
static const wxChar *ARG_PSN = _T("-psn_"); 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 // remove this argument
memmove(argv, argv + 1, argc--); --argc;
memmove(argv + 1, argv + 2, argc * sizeof(char *));
} }
} }

5
src/mac/carbon/app.cpp
View File

@@ -609,10 +609,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
if ( argc > 1 ) if ( argc > 1 )
{ {
static const wxChar *ARG_PSN = _T("-psn_"); 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 // remove this argument
memmove(argv, argv + 1, argc--); --argc;
memmove(argv + 1, argv + 2, argc * sizeof(char *));
} }
} }