changes for embedded, applying patch, fixes #10359

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

diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm
index 173df9c046c06a9a76fb1afeac80222c8823f8dc..a33ccd109880fb2c9099891121037f3fc5a15228 100644 (file)
--- a/src/osx/cocoa/utils.mm
+++ b/src/osx/cocoa/utils.mm
@@ -192,8 +192,8 @@ bool wxApp::DoInitGui()
         NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
         [appleEventManager setEventHandler:controller andSelector:@selector(handleGetURLEvent:withReplyEvent:)
             forEventClass:kInternetEventClass andEventID:kAEGetURL];
+        [NSApp finishLaunching];
     }
-    [NSApp finishLaunching];
     return true;
 }
 

diff --git a/src/osx/core/hid.cpp b/src/osx/core/hid.cpp
index 06ba8a0f5f661b68e72839b69afda93e6dc95414..7430e714c581493a8bdd038fd627768586084446 100644 (file)
--- a/src/osx/core/hid.cpp
+++ b/src/osx/core/hid.cpp
@@ -651,6 +651,7 @@ class wxHIDModule : public wxModule
         {
             for(size_t i = 0; i < sm_keyboards.GetCount(); ++i)
                 delete (wxHIDKeyboard*) sm_keyboards[i];
+               sm_keyboards.Clear(); 
         }
 };