From 6cb30079449cb569bac7c1f86376234a79384bdb Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Wed, 14 Apr 2010 17:06:53 +0000 Subject: [PATCH] fixing build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/iphone/dialog.mm | 29 ----------------------------- src/osx/iphone/evtloop.mm | 9 +++++++++ 2 files changed, 9 insertions(+), 29 deletions(-) diff --git a/src/osx/iphone/dialog.mm b/src/osx/iphone/dialog.mm index 62853152ec..62732abfab 100644 --- a/src/osx/iphone/dialog.mm +++ b/src/osx/iphone/dialog.mm @@ -34,32 +34,3 @@ void wxDialog::DoShowWindowModal() void wxDialog::EndWindowModal() { } - -void wxDialog::DoShowModal() -{ - wxCHECK_RET( !IsModal(), wxT("DoShowModal() called twice") ); - - wxModalDialogs.Append(this); - - SetFocus() ; -/* - WindowGroupRef windowGroup; - WindowGroupRef formerParentGroup; - bool resetGroupParent = false; - - if ( GetParent() == NULL ) - { - windowGroup = GetWindowGroup(windowRef) ; - formerParentGroup = GetWindowGroupParent( windowGroup ); - SetWindowGroupParent( windowGroup, GetWindowGroupOfClass( kMovableModalWindowClass ) ); - resetGroupParent = true; - } -*/ - -/* - if ( resetGroupParent ) - { - SetWindowGroupParent( windowGroup , formerParentGroup ); - } -*/ -} diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm index e050cdd0ce..0477771765 100644 --- a/src/osx/iphone/evtloop.mm +++ b/src/osx/iphone/evtloop.mm @@ -97,6 +97,15 @@ void wxGUIEventLoop::DoRun() } } +int wxGUIEventLoop::DoDispatchTimeout(unsigned long timeout) +{ + return wxCFEventLoop::DoDispatchTimeout(timeout); +} + +void wxGUIEventLoop::DoStop() +{ + return wxCFEventLoop::DoStop(); +} // TODO move into a evtloop_osx.cpp wxModalEventLoop::wxModalEventLoop(wxWindow *modalWindow) -- 2.45.2