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 38a786578f08d1c1ef31865ebc1280b6fc4514ac..2a78c6817850f45f26ca82a9ae39795d21e4f1f4 100644 (file)
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -79,28 +79,6 @@ static int CalculateUIEventMaskFromEventCategory(wxEventCategory cat)
 }
 */
 
 }
 */
 

-@interface wxAppDelegate : NSObject <UIApplicationDelegate> {
-}
-
-@end
-
-@implementation wxAppDelegate
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {   
-       wxTheApp->OnInit();
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application { 
-    wxCloseEvent event;
-    wxTheApp->OnEndSession(event);
-}
-
-- (void)dealloc {
-       [super dealloc];
-}
-
-@end
-

 wxGUIEventLoop::wxGUIEventLoop()
 {
 }
 wxGUIEventLoop::wxGUIEventLoop()
 {
 }


@@ -119,12 +97,41 @@ void wxGUIEventLoop::DoRun()
     }
 }
 
     }
 }
 

-wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
+int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)
+{
+    return wxCFEventLoop::DoDispatchTimeout(timeout);
+}
+
+void wxGUIEventLoop::DoStop()

 {
 {

-    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
+    return wxCFEventLoop::DoStop();
+}
+
+CFRunLoopRef wxGUIEventLoop::CFGetCurrentRunLoop() const
+{
+    return wxCFEventLoop::CFGetCurrentRunLoop();
+}
+
+
+// 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" );
     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::DoRun()
 {
     // presentModalViewController:animated: