fixing copy size

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index edf1ffac4b4f46c36fc9bbf0eaad968cc5591ed9..d2378b1df97e72359f2a3b79da50050cf6be1816 100644 (file)
--- a/src/osx/carbon/app.cpp
+++ b/src/osx/carbon/app.cpp
@@ -807,7 +807,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         {
             // remove this argument
             --argc;
         {
             // remove this argument
             --argc;

-            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar*));

         }
     }
 
         }
     }
 


@@ -832,8 +832,8 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
             // Only eat this option if it has an argument
             if( (i + 1) < argc )
             {
             // Only eat this option if it has an argument
             if( (i + 1) < argc )
             {

+                memmove(argv + i, argv + i + 2, (argc-i-1)*sizeof(wxChar*));

                 argc -= 2;
                 argc -= 2;

-                memmove(argv + i, argv + i + 2, argc * sizeof(char *));

                 // drop back one position so the next run through the loop
                 // reprocesses the argument at our current index.
                 --i;
                 // drop back one position so the next run through the loop
                 // reprocesses the argument at our current index.
                 --i;