No real changes, just get rid of _wxMenuAt() in wxOSX menu code.

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

diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm
index 67e4784965945b5d4c733fae2c0df6ccff7cc2c9..2a78c6817850f45f26ca82a9ae39795d21e4f1f4 100644 (file)
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -32,6 +32,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 +81,63 @@ static int CalculateUIEventMaskFromEventCategory(wxEventCategory cat)
 
 wxGUIEventLoop::wxGUIEventLoop()
 {
 
 wxGUIEventLoop::wxGUIEventLoop()
 {

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

 }
 
 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::DoStop()
+{
+    return wxCFEventLoop::DoStop();
+}
+
+CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
+{
+    return wxCFEventLoop::CFGetCurrentRunLoop();
+}

 
 

-    if ( event == nil )
-        return -1;

 
 

-    [NSApp sendEvent: event];
-*/
-    return 1;
+// 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::DoRun()
+{
+    // presentModalViewController:animated:
+}
+
+void wxModalEventLoop::DoStop()
+{
+    // (void)dismissModalViewControllerAnimated:(BOOL)animated

 }
 }