streamlining code for extra controls

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

diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm
index 41b8235296d5504ddee17da5825442ab8b4451db..0477771765bc9a1e467c33f15176e5579ec6d23e 100644 (file)
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -97,12 +97,34 @@ void wxGUIEventLoop::DoRun()
     }
 }
 
     }
 }
 

-wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
+int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout)

 {
 {

-    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
+    return wxCFEventLoop::DoDispatchTimeout(timeout);
+}
+
+void wxGUIEventLoop::DoStop()
+{
+    return wxCFEventLoop::DoStop();
+}
+// 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: