Move code removing "-psn_xxx" command line arguments to common code.

[wxWidgets.git] / src / osx / iphone / evtloop.mm

diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm
index 67e4784965945b5d4c733fae2c0df6ccff7cc2c9..f928274e4171ecb3c4d06dc002aa5f82b354613e 100644 (file)
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12
 // Author:      Vadim Zeitlin, Stefan Csomor
 // Modified by:
 // Created:     2006-01-12

-// RCS-ID:      $Id: evtloop.cpp 54845 2008-07-30 14:52:41Z SC $

 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -32,6 +31,10 @@
 
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 

+#if wxUSE_GUI
+    #include "wx/nonownedwnd.h"
+#endif
+

 #include "wx/osx/private.h"
 
 // ============================================================================
 #include "wx/osx/private.h"
 
 // ============================================================================


@@ -77,24 +80,67 @@ static int CalculateUIEventMaskFromEventCategory(wxEventCategory cat)
 
 wxGUIEventLoop::wxGUIEventLoop()
 {
 
 wxGUIEventLoop::wxGUIEventLoop()
 {

-    m_sleepTime = 0.0;
+}
+
+void wxGUIEventLoop::OSXDoRun()
+{
+    if ( IsMain() )
+    {
+        wxMacAutoreleasePool pool;
+        const char* appname = "app";
+        UIApplicationMain( 1, (char**) &appname, nil, @"wxAppDelegate" );
+    }
+    else 
+    {
+        wxCFEventLoop::OSXDoRun();
+    }

 }
 
 int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
 {
 }
 
 int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
 {

-    wxMacAutoreleasePool autoreleasepool;
+    return wxCFEventLoop::DoDispatchTimeout(timeout);
+}

 
 

-/*
-    UIEvent *event = [[UIApplication sharedApplication]
-                nextEventMatchingMask:NSAnyEventMask
-                untilDate:[NSDate dateWithTimeIntervalSinceNow: timeout/1000]
-                inMode:NSDefaultRunLoopMode
-                dequeue: YES];
+void wxGUIEventLoop::OSXDoStop()
+{
+    return wxCFEventLoop::OSXDoStop();
+}

 
 

-    if ( event == nil )
-        return -1;
+CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
+{
+    return wxCFEventLoop::CFGetCurrentRunLoop();
+}

 
 

-    [NSApp sendEvent: event];
-*/
-    return 1;
+void wxGUIEventLoop::WakeUp()
+{
+    return wxCFEventLoop::WakeUp();
+}
+
+// TODO move into a evtloop_osx.cpp
+
+wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow)
+{
+    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (modalWindow);
+    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
+    m_modalNativeWindow = m_modalWindow->GetWXWindow();
+}
+
+wxModalEventLoop::wxModalEventLoop(WXWindow modalNativeWindow)
+{
+    m_modalWindow = NULL;
+    wxASSERT_MSG( modalNativeWindow != NULL, "must pass in a toplevel window for modal event loop" );
+    m_modalNativeWindow = modalNativeWindow;
+}
+
+// END move into a evtloop_osx.cpp
+
+
+void wxModalEventLoop::OSXDoRun()
+{
+    // presentModalViewController:animated:
+}
+
+void wxModalEventLoop::OSXDoStop()
+{
+    // (void)dismissModalViewControllerAnimated:(BOOL)animated

 }
 }