Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing multilib build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-03 06:59:33 +00:00
parent 41616c8ac6
commit 2439f1d968
4 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osx/carbon/evtloop.cpp
View File

@@ -29,9 +29,12 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/app.h" #include "wx/app.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/nonownedwnd.h"
#endif // WX_PRECOMP #endif // WX_PRECOMP
#if wxUSE_GUI
#include "wx/nonownedwnd.h"
#endif
#include "wx/osx/private.h" #include "wx/osx/private.h"
// ============================================================================ // ============================================================================
@@ -91,6 +94,12 @@ void wxGUIEventLoop::DoStop()
QuitApplicationEventLoop(); 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() void wxModalEventLoop::DoRun()
{ {
wxMacAutoreleasePool autoreleasepool; wxMacAutoreleasePool autoreleasepool;

6
src/osx/cocoa/evtloop.mm
View File

@@ -175,6 +175,12 @@ void wxGUIEventLoop::DoStop()
[NSApp stop:0]; [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() void wxModalEventLoop::DoRun()
{ {
wxMacAutoreleasePool pool; wxMacAutoreleasePool pool;

24
src/osx/core/evtloop_cf.cpp
View File

@@ -409,27 +409,3 @@ void wxCFEventLoop::Exit(int rc)
m_shouldExit = true; m_shouldExit = true;
DoStop(); 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

19
src/osx/iphone/evtloop.mm
View File

@@ -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"
// ============================================================================ // ============================================================================
@@ -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
}