Updated Scintilla to version 1.58

[wxWidgets.git] / src / cocoa / app.mm

diff --git a/src/cocoa/app.mm b/src/cocoa/app.mm
index a499a3a0e68f3f3b2d79adec2c7c2b3fab91075f..909b71fe4fd43317334c61e80cc5b731c19d1939 100644 (file)
--- a/src/cocoa/app.mm
+++ b/src/cocoa/app.mm
@@ -25,6 +25,7 @@
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/mbarman.h"
+#include "wx/cocoa/NSApplication.h"
 
 #if wxUSE_WX_RESOURCES
 #  include "wx/resource.h"
@@ -119,18 +120,6 @@ WX_IMPLEMENT_POSER(wxPoserNSApplication);
 // ========================================================================
 // wxNSApplicationDelegate
 // ========================================================================
-@interface wxNSApplicationDelegate : NSObject
-{
-}
-
-// Delegate methods
-- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication;
-- (void)applicationWillBecomeActive:(NSNotification *)notification;
-- (void)applicationDidBecomeActive:(NSNotification *)notification;
-- (void)applicationWillResignActive:(NSNotification *)notification;
-- (void)applicationDidResignActive:(NSNotification *)notification;
-@end // interface wxNSApplicationDelegate : NSObject
-
 @implementation wxNSApplicationDelegate : NSObject
 
 // NOTE: Terminate means that the event loop does NOT return and thus
@@ -191,11 +180,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     if ( argc > 1 )
     {
         static const wxChar *ARG_PSN = _T("-psn_");
-        if ( wxStrncmp(argv[1], ARG_PSN, strlen(ARG_PSN)) == 0 )
+        if ( wxStrncmp(argv[1], ARG_PSN, wxStrlen(ARG_PSN)) == 0 )
         {
             // remove this argument
             --argc;
-            memmove(argv + 1, argv + 2, argc * sizeof(char *));
+            memmove(argv + 1, argv + 2, argc * sizeof(wxChar *));
         }
     }