no 10.4 support anymore

[wxWidgets.git] / src / osx / carbon / app.cpp

diff --git a/src/osx/carbon/app.cpp b/src/osx/carbon/app.cpp
index edf1ffac4b4f46c36fc9bbf0eaad968cc5591ed9..95b1ab78b05be0a7a88ab4a342927cecc63b0c55 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;
-            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 )
             {
+                memmove(argv + i, argv + i + 2, (argc-i-1)*sizeof(wxChar*));
                 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;
@@ -1650,7 +1650,7 @@ bool wxApp::MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers
     {
         wxKeyEvent eventCharHook(wxEVT_CHAR_HOOK, event);
         handled = focus->HandleWindowEvent( eventCharHook );
-        if ( handled && eventCharHook.GetSkipped() )
+        if ( handled && eventCharHook.IsNextEventAllowed() )
             handled = false ;
     }