added the static function GetLabelText() to wxStaticText which was mentioned in the...

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

diff --git a/src/mac/carbon/evtloop.cpp b/src/mac/carbon/evtloop.cpp
index ab9e51700d43399ad1b662bfb50424ca03f43b1c..681564bffae0dc11a557cabcc089e382962fc8b1 100644 (file)
--- a/src/mac/carbon/evtloop.cpp
+++ b/src/mac/carbon/evtloop.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        mac/carbon/evtloop.cpp
+// Name:        src/mac/carbon/evtloop.cpp

 // Purpose:     implementation of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxEventLoop for wxMac
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -25,10 +25,16 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

-#include "wx/app.h"

 
 

-#include <Carbon/Carbon.h>
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+#endif // WX_PRECOMP

 
 

+#ifdef __DARWIN__
+    #include <Carbon/Carbon.h>
+#else
+    #include <Carbon.h>
+#endif

 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================
 // ============================================================================
 // wxEventLoop implementation
 // ============================================================================


@@ -39,7 +45,7 @@
 
 #if wxMAC_USE_RUN_APP_EVENT_LOOP
 
 
 #if wxMAC_USE_RUN_APP_EVENT_LOOP
 

-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()

 {
     wxEventLoopActivator activate(this);
 
 {
     wxEventLoopActivator activate(this);
 


@@ -48,7 +54,7 @@ int wxEventLoop::Run()
     return m_exitcode;
 }
 
     return m_exitcode;
 }
 

-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)

 {
     m_exitcode = rc;
 
 {
     m_exitcode = rc;
 


@@ -63,7 +69,7 @@ void wxEventLoop::Exit(int rc)
 // functions only used by wxEventLoopManual-based implementation
 // ----------------------------------------------------------------------------
 
 // functions only used by wxEventLoopManual-based implementation
 // ----------------------------------------------------------------------------
 

-void wxEventLoop::WakeUp()
+void wxGUIEventLoop::WakeUp()

 {
     extern void wxMacWakeUp();
 
 {
     extern void wxMacWakeUp();
 


@@ -76,7 +82,7 @@ void wxEventLoop::WakeUp()
 // low level functions used in both cases
 // ----------------------------------------------------------------------------
 
 // low level functions used in both cases
 // ----------------------------------------------------------------------------
 

-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
     EventRef theEvent;
 
 {
     EventRef theEvent;
 


@@ -90,7 +96,7 @@ bool wxEventLoop::Pending() const
            ) == noErr;
 }
 
            ) == noErr;
 }
 

-bool wxEventLoop::Dispatch()
+bool wxGUIEventLoop::Dispatch()

 {
     // TODO: we probably should do the dispatching directly from here but for
     //       now it's easier to forward to wxApp which has all the code to do
 {
     // TODO: we probably should do the dispatching directly from here but for
     //       now it's easier to forward to wxApp which has all the code to do


@@ -101,4 +107,3 @@ bool wxEventLoop::Dispatch()
     wxTheApp->MacDoOneEvent();
     return true;
 }
     wxTheApp->MacDoOneEvent();
     return true;
 }

-