aui dock renumbering fix

[wxWidgets.git] / src / mac / carbon / app.cpp

diff --git a/src/mac/carbon/app.cpp b/src/mac/carbon/app.cpp
index 683d9c7401786ff1271228917bb942245fc58857..4b45779556ed7c01ade393d0d339c00129de1618 100644 (file)
--- a/src/mac/carbon/app.cpp
+++ b/src/mac/carbon/app.cpp
@@ -133,7 +133,7 @@ pascal OSErr AEHandleRApp( const AppleEvent *event , AppleEvent *reply , SRefCon
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 
     return wxTheApp->MacHandleAERApp( (AppleEvent*) event , reply) ;
 }
 

-pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , long WXUNUSED(refcon) )
+pascal OSErr AEHandleGURL( const AppleEvent *event , AppleEvent *reply , SRefCon WXUNUSED(refcon) )

 {
     return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ;
 }
 {
     return wxTheApp->MacHandleAEGURL((WXEVENTREF *)event , reply) ;
 }


@@ -295,7 +295,7 @@ void wxApp::MacOpenFile(const wxString & fileName )
 #endif
 }
 
 #endif
 }
 

-void wxApp::MacOpenURL(const wxString & url )
+void wxApp::MacOpenURL(const wxString & WXUNUSED(url) )

 {
 }
 
 {
 }
 


@@ -543,7 +543,9 @@ static const EventTypeSpec eventList[] =
 } ;
 
 static pascal OSStatus
 } ;
 
 static pascal OSStatus

-wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+wxMacAppMenuEventHandler( EventHandlerCallRef WXUNUSED(handler),
+                          EventRef event,
+                          void *WXUNUSED(data) )

 {
     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;
 {
     wxMacCarbonEvent cEvent( event ) ;
     MenuRef menuRef = cEvent.GetParameter<MenuRef>(kEventParamDirectObject) ;


@@ -596,7 +598,10 @@ wxMacAppMenuEventHandler( EventHandlerCallRef handler , EventRef event , void *d
     return eventNotHandledErr;
 }
 
     return eventNotHandledErr;
 }
 

-static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus
+wxMacAppCommandEventHandler( EventHandlerCallRef WXUNUSED(handler) ,
+                             EventRef event ,
+                             void *WXUNUSED(data) )

 {
     OSStatus result = eventNotHandledErr ;
 
 {
     OSStatus result = eventNotHandledErr ;
 


@@ -679,7 +684,10 @@ static pascal OSStatus wxMacAppCommandEventHandler( EventHandlerCallRef handler
     return result ;
 }
 
     return result ;
 }
 

-static pascal OSStatus wxMacAppApplicationEventHandler( EventHandlerCallRef handler , EventRef event , void *data )
+static pascal OSStatus
+wxMacAppApplicationEventHandler( EventHandlerCallRef WXUNUSED(handler) ,
+                                 EventRef event ,
+                                 void *WXUNUSED(data) )

 {
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventKind( event ) )
 {
     OSStatus result = eventNotHandledErr ;
     switch ( GetEventKind( event ) )


@@ -760,9 +768,16 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacAppEventHandler )
 
 #ifdef __WXDEBUG__
 
 
 #ifdef __WXDEBUG__
 

-pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 options,
-    const char *assertionString, const char *exceptionLabelString,
-    const char *errorString, const char *fileName, long lineNumber, void *value, ConstStr255Param outputMsg)
+pascal static void
+wxMacAssertOutputHandler(OSType WXUNUSED(componentSignature),
+                         UInt32 WXUNUSED(options),
+                         const char *assertionString,
+                         const char *exceptionLabelString,
+                         const char *errorString,
+                         const char *fileName,
+                         long lineNumber,
+                         void *value,
+                         ConstStr255Param WXUNUSED(outputMsg))

 {
     // flow into assert handling
     wxString fileNameStr ;
 {
     // flow into assert handling
     wxString fileNameStr ;


@@ -800,13 +815,7 @@ pascal static void wxMacAssertOutputHandler(OSType componentSignature, UInt32 op
 #endif //__WXDEBUG__
 
 #ifdef __WXMAC_OSX__
 #endif //__WXDEBUG__
 
 #ifdef __WXMAC_OSX__

-extern "C"
-{
-   // m_macEventPosted run loop source callback:
-   void macPostedEventCallback(void *unused);
-}
-
-void macPostedEventCallback(void *unused)
+extern "C" void macPostedEventCallback(void *WXUNUSED(unused))

 {
     wxTheApp->ProcessPendingEvents();
 }
 {
     wxTheApp->ProcessPendingEvents();
 }


@@ -1134,14 +1143,9 @@ wxApp::wxApp()
 #endif
 }
 
 #endif
 }
 

-void wxApp::OnIdle(wxIdleEvent& event)
+void wxApp::OnIdle(wxIdleEvent& WXUNUSED(event))

 {
 {

-    wxAppBase::OnIdle(event);
-
-    // If they are pending events, we must process them: pending events are
-    // either events to the threads other than main or events posted with
-    // wxPostEvent() functions
-    wxMacProcessNotifierAndPendingEvents();
+    wxMacProcessNotifierEvents();

 
   if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();
 
   if (!wxMenuBar::MacGetInstalledMenuBar() && wxMenuBar::MacGetCommonMenuBar())
     wxMenuBar::MacGetCommonMenuBar()->MacInstallMenuBar();


@@ -1196,6 +1200,15 @@ bool wxApp::Yield(bool onlyIfNeeded)
         return false;
     }
 
         return false;
     }
 

+#if wxUSE_THREADS
+    // Yielding from a non-gui thread needs to bail out, otherwise we end up
+    // possibly sending events in the thread too.
+    if ( !wxThread::IsMain() )
+    {
+        return true;
+    }
+#endif // wxUSE_THREADS
+

     s_inYield = true;
 
     // by definition yield should handle all non-processed events
     s_inYield = true;
 
     // by definition yield should handle all non-processed events


@@ -1268,7 +1281,7 @@ void wxApp::MacDoOneEvent()
 }
 
 // virtual
 }
 
 // virtual

-void wxApp::MacHandleUnhandledEvent( WXEVENTREF evr )
+void wxApp::MacHandleUnhandledEvent( WXEVENTREF WXUNUSED(evr) )

 {
     // Override to process unhandled events as you please
 }
 {
     // Override to process unhandled events as you please
 }