Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

[wxWidgets.git] / include / wx / evtloop.h

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 2a71defd7a741c8144070a3012d04452708aa5f5..e2ae68ce6c013cf1bed6361081e3551ac6fc80d2 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -12,7 +12,7 @@
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 
 #ifndef _WX_EVTLOOP_H_
 #define _WX_EVTLOOP_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "evtloop.h"
 #endif
 
     #pragma interface "evtloop.h"
 #endif
 


@@ -47,11 +47,16 @@ public:
     // return currently active (running) event loop, may be NULL
     static wxEventLoop *GetActive() { return ms_activeLoop; }
 
     // return currently active (running) event loop, may be NULL
     static wxEventLoop *GetActive() { return ms_activeLoop; }
 

+    // set currently active (running) event loop
+    static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
+

 protected:
     // the pointer to the port specific implementation class
     class WXDLLEXPORT wxEventLoopImpl *m_impl;
     // the pointer to currently active loop
     static wxEventLoop *ms_activeLoop;
 protected:
     // the pointer to the port specific implementation class
     class WXDLLEXPORT wxEventLoopImpl *m_impl;
     // the pointer to currently active loop
     static wxEventLoop *ms_activeLoop;

+
+    DECLARE_NO_COPY_CLASS(wxEventLoop)

 };
 
 #endif // _WX_EVTLOOP_H_
 };
 
 #endif // _WX_EVTLOOP_H_