Test for reentrance into non-recursive wxMutex. If it happens, yield dead lock error...

[wxWidgets.git] / src / osx / window_osx.cpp

diff --git a/src/osx/window_osx.cpp b/src/osx/window_osx.cpp
index 24c45ddb07696afebc6c2cac84a35a574eeb383d..f2466b55262cd3e923a3213aeb849c2464ef9ec1 100644 (file)
--- a/src/osx/window_osx.cpp
+++ b/src/osx/window_osx.cpp
@@ -384,9 +384,9 @@ void wxWindowMac::DoSetWindowVariant( wxWindowVariant variant )
 
 void wxWindowMac::MacUpdateControlFont()
 {
-#if wxOSX_USE_CARBON
+
     m_peer->SetFont( GetFont() , GetForegroundColour() , GetWindowStyle() ) ;
-#endif
+
     // do not trigger refreshes upon invisible and possible partly created objects
     if ( IsShownOnScreen() )
         Refresh() ;
@@ -774,8 +774,6 @@ bool wxWindowMac::DoPopupMenu(wxMenu *menu, int x, int y)
         }
     }
 
-    menu->MacAfterDisplay( true ) ;
-    menu->SetInvokingWindow( NULL );
 #else
     menu->SetInvokingWindow( NULL );
     return false;