projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't include private headers from wx/unix/evtloop.h
[wxWidgets.git]
/
src
/
cocoa
/
app.mm
diff --git
a/src/cocoa/app.mm
b/src/cocoa/app.mm
index 6bafffa5551566c20e02015f0271d159f499c326..662859f0912fb5b66fc9e3dc36534877357ce51e 100644
(file)
--- a/
src/cocoa/app.mm
+++ b/
src/cocoa/app.mm
@@
-15,7
+15,6
@@
#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/app.h"
#ifndef WX_PRECOMP
- #include "wx/dc.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
#include "wx/intl.h"
#include "wx/log.h"
#include "wx/module.h"
@@
-26,6
+25,8
@@
#include "wx/cocoa/mbarman.h"
#include "wx/cocoa/NSApplication.h"
#include "wx/cocoa/mbarman.h"
#include "wx/cocoa/NSApplication.h"
+#include "wx/cocoa/dc.h"
+
#import <AppKit/NSApplication.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSThread.h>
#import <AppKit/NSApplication.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSThread.h>
@@
-162,7
+163,7
@@
void wxApp::CleanUp()
{
wxAutoNSAutoreleasePool pool;
{
wxAutoNSAutoreleasePool pool;
- wx
DC
::CocoaShutdownTextSystem();
+ wx
CocoaDCImpl
::CocoaShutdownTextSystem();
wxMenuBarManager::DestroyInstance();
[[NSNotificationCenter defaultCenter] removeObserver:sg_cocoaAppObserver];
wxMenuBarManager::DestroyInstance();
[[NSNotificationCenter defaultCenter] removeObserver:sg_cocoaAppObserver];
@@
-188,7
+189,9
@@
wxApp::wxApp()
#endif // __WXDEBUG__
argc = 0;
#endif // __WXDEBUG__
argc = 0;
+#if !wxUSE_UNICODE
argv = NULL;
argv = NULL;
+#endif
m_cocoaApp = NULL;
m_cocoaAppDelegate = NULL;
}
m_cocoaApp = NULL;
m_cocoaAppDelegate = NULL;
}
@@
-255,7
+258,7
@@
bool wxApp::OnInitGui()
if(!sm_isEmbedded)
wxMenuBarManager::CreateInstance();
if(!sm_isEmbedded)
wxMenuBarManager::CreateInstance();
- wx
DC
::CocoaInitializeTextSystem();
+ wx
CocoaDCImpl
::CocoaInitializeTextSystem();
return true;
}
return true;
}
@@
-294,16
+297,13
@@
void wxApp::Exit()
// Yield to other processes
bool wxApp::Yield(bool onlyIfNeeded)
{
// Yield to other processes
bool wxApp::Yield(bool onlyIfNeeded)
{
- // MT-FIXME
- static bool s_inYield = false;
-
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
#endif // wxUSE_LOG
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
#endif // wxUSE_LOG
- if (
s_in
Yield)
+ if (
m_isInside
Yield)
{
if ( !onlyIfNeeded )
{
{
if ( !onlyIfNeeded )
{
@@
-313,7
+313,7
@@
bool wxApp::Yield(bool onlyIfNeeded)
return false;
}
return false;
}
-
s_in
Yield = true;
+
m_isInside
Yield = true;
// Run the event loop until it is out of events
while(1)
// Run the event loop until it is out of events
while(1)
@@
-355,7
+355,7
@@
bool wxApp::Yield(bool onlyIfNeeded)
wxLog::Resume();
#endif // wxUSE_LOG
wxLog::Resume();
#endif // wxUSE_LOG
-
s_in
Yield = false;
+
m_isInside
Yield = false;
return true;
}
return true;
}