fixing multilib build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/evtloop.cpp b/src/osx/carbon/evtloop.cpp
index f208d9801cdc0e90a4a907d37b99bc004a00e459..68695943bb582338a3bbdec6dc47e7e9bdc7dc4a 100644 (file)
--- a/src/osx/carbon/evtloop.cpp
+++ b/src/osx/carbon/evtloop.cpp
@@ -29,9 +29,12 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
-    #include "wx/nonownedwnd.h"
 #endif // WX_PRECOMP
 
+#if wxUSE_GUI
+#include "wx/nonownedwnd.h"
+#endif
+
 #include "wx/osx/private.h"
 
 // ============================================================================
@@ -91,6 +94,12 @@ void wxGUIEventLoop::DoStop()
     QuitApplicationEventLoop();
 }
 
+wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
+{
+    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
+    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
+}
+
 void wxModalEventLoop::DoRun()
 {
     wxMacAutoreleasePool autoreleasepool;

diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm
index 4771978ff4c325710c5c818f25dae9ab7568c28a..cfa7486f84365f21d661ce191e29c9a75a0b4820 100644 (file)
--- a/src/osx/cocoa/evtloop.mm
+++ b/src/osx/cocoa/evtloop.mm
@@ -175,6 +175,12 @@ void wxGUIEventLoop::DoStop()
     [NSApp stop:0];
 }
 
+wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
+{
+    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
+    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
+}
+
 void wxModalEventLoop::DoRun()
 {
     wxMacAutoreleasePool pool;

diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp
index 4b3c9ad9234a32075421ccacba1acaad80f2e5e2..eec3c3bfb006726389ad449448a1ddd4614ea252 100644 (file)
--- a/src/osx/core/evtloop_cf.cpp
+++ b/src/osx/core/evtloop_cf.cpp
@@ -409,27 +409,3 @@ void wxCFEventLoop::Exit(int rc)
     m_shouldExit = true;
     DoStop();
 }
-
-#if wxUSE_GUI
-
-wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
-{
-    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
-    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
-}
-
-#ifdef __WXOSX_IPHONE__
-
-void wxModalEventLoop::DoRun()
-{
-    // presentModalViewController:animated:
-}
-
-void wxModalEventLoop::DoStop()
-{
-    // (void)dismissModalViewControllerAnimated:(BOOL)animated
-}
-
-#endif // wxUSE_GUI
-
-#endif

diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm
index ca463a6dcf5bcf205a88232a783d491e32069c7f..38a786578f08d1c1ef31865ebc1280b6fc4514ac 100644 (file)
--- a/src/osx/iphone/evtloop.mm
+++ b/src/osx/iphone/evtloop.mm
@@ -32,6 +32,10 @@
 
 #include "wx/log.h"
 
+#if wxUSE_GUI
+    #include "wx/nonownedwnd.h"
+#endif
+
 #include "wx/osx/private.h"
 
 // ============================================================================
@@ -115,3 +119,18 @@ void wxGUIEventLoop::DoRun()
     }
 }
 
+wxModalEventLoop::wxModalEventLoop(wxWindow *winModal)
+{
+    m_modalWindow = dynamic_cast<wxNonOwnedWindow*> (winModal);
+    wxASSERT_MSG( m_modalWindow != NULL, "must pass in a toplevel window for modal event loop" );
+}
+
+void wxModalEventLoop::DoRun()
+{
+    // presentModalViewController:animated:
+}
+
+void wxModalEventLoop::DoStop()
+{
+    // (void)dismissModalViewControllerAnimated:(BOOL)animated
+}