fixed wxMBConv_iconv to work with UTF-16/32

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

diff --git a/src/mac/carbon/evtloop.cpp b/src/mac/carbon/evtloop.cpp
index cfe38c8b4cb1af15a36b328241cf42f89deed470..d5a9804e67757f57509bfa04e882e7d8585ad7a4 100644 (file)
--- a/src/mac/carbon/evtloop.cpp
+++ b/src/mac/carbon/evtloop.cpp
@@ -25,33 +25,28 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

+#include "wx/app.h"

 
 

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

 // ============================================================================
 // ============================================================================

-// implementation
+// wxEventLoop implementation

 // ============================================================================
 
 // ============================================================================
 

-wxEventLoop::wxEventLoop()
-{
-    m_exitcode = 0;
-#if !wxMAC_USE_RUN_APP_EVENT_LOOP
-    m_shouldExit = false;
-#endif
-}
+// ----------------------------------------------------------------------------
+// high level functions for RunApplicationEventLoop() case
+// ----------------------------------------------------------------------------
+
+#if wxMAC_USE_RUN_APP_EVENT_LOOP

 
 int wxEventLoop::Run()
 {
     wxEventLoopActivator activate(this);
 
 
 int wxEventLoop::Run()
 {
     wxEventLoopActivator activate(this);
 

-#if wxMAC_USE_RUN_APP_EVENT_LOOP

     RunApplicationEventLoop();
     RunApplicationEventLoop();

-#else // manual event loop
-    while ( !m_shouldExit )
-    {
-        Dispatch();
-    }
-#endif // auto/manual event loop

 
     return m_exitcode;
 }
 
     return m_exitcode;
 }


@@ -60,13 +55,30 @@ void wxEventLoop::Exit(int rc)
 {
     m_exitcode = rc;
 
 {
     m_exitcode = rc;
 

-#if wxMAC_USE_RUN_APP_EVENT_LOOP

     QuitApplicationEventLoop();
     QuitApplicationEventLoop();

+
+    OnExit();
+}
+

 #else // manual event loop
 #else // manual event loop

-    m_shouldExit = true;
-#endif // auto/manual event loop
+
+// ----------------------------------------------------------------------------
+// functions only used by wxEventLoopManual-based implementation
+// ----------------------------------------------------------------------------
+
+void wxEventLoop::WakeUp()
+{
+    extern void wxMacWakeUp();
+
+    wxMacWakeUp();

 }
 
 }
 

+#endif // high/low-level event loop
+
+// ----------------------------------------------------------------------------
+// low level functions used in both cases
+// ----------------------------------------------------------------------------
+

 bool wxEventLoop::Pending() const
 {
     EventRef theEvent;
 bool wxEventLoop::Pending() const
 {
     EventRef theEvent;