made wxApp::argv an object convertible to either char** or wchar_t** for better compa...

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

diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index ff0ee61d3fb8456b88c90f39c447d18ba7f4a240..f6d1b55313303ecced284f1c87218e41493769f3 100644 (file)
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -14,8 +14,6 @@
 
 #include "wx/utils.h"
 
 
 #include "wx/utils.h"
 

-class WXDLLEXPORT wxEventLoop;
-

 // ----------------------------------------------------------------------------
 // wxEventLoopBase: interface for wxEventLoop
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoopBase: interface for wxEventLoop
 // ----------------------------------------------------------------------------


@@ -46,10 +44,10 @@ public:
     virtual bool Dispatch() = 0;
 
     // return currently active (running) event loop, may be NULL
     virtual bool Dispatch() = 0;
 
     // return currently active (running) event loop, may be NULL

-    static wxEventLoop *GetActive() { return ms_activeLoop; }
+    static wxEventLoopBase *GetActive() { return ms_activeLoop; }

 
     // set currently active (running) event loop
 
     // set currently active (running) event loop

-    static void SetActive(wxEventLoop* loop) { ms_activeLoop = loop; }
+    static void SetActive(wxEventLoopBase* loop) { ms_activeLoop = loop; }

 
     // is this event loop running now?
     //
 
     // is this event loop running now?
     //


@@ -69,7 +67,7 @@ protected:
 
 
     // the pointer to currently active loop
 
 
     // the pointer to currently active loop

-    static wxEventLoop *ms_activeLoop;
+    static wxEventLoopBase *ms_activeLoop;

 
     DECLARE_NO_COPY_CLASS(wxEventLoopBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxEventLoopBase)
 };


@@ -123,7 +121,7 @@ protected:
     #include "wx/dfb/evtloop.h"
 #else // other platform
 
     #include "wx/dfb/evtloop.h"
 #else // other platform
 

-class WXDLLEXPORT wxEventLoopImpl;
+class WXDLLIMPEXP_FWD_CORE wxEventLoopImpl;

 
 class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase
 {
 
 class WXDLLEXPORT wxGUIEventLoop : public wxEventLoopBase
 {


@@ -151,13 +149,18 @@ protected:
     #include "wx/unix/evtloop.h"
 #endif
 
     #include "wx/unix/evtloop.h"
 #endif
 

-// cannot use typedef because wxEventLoop is forward-declared in many places
+// we use a class rather than a typedef because wxEventLoop is forward-declared
+// in many places

 #if wxUSE_GUI
 #if wxUSE_GUI

-class wxEventLoop : public wxGUIEventLoop { };
-#elif defined(__WXMSW__) || defined(__UNIX__)
-class wxEventLoop : public wxConsoleEventLoop { };
-#else // we still must define it somehow for the code below...
-class wxEventLoop : public wxEventLoopBase { };
+    class wxEventLoop : public wxGUIEventLoop { };
+#else // !GUI
+    // we can't define wxEventLoop differently in GUI and base libraries so use
+    // a #define to still allow writing wxEventLoop in the user code
+    #if defined(__WXMSW__) || defined(__UNIX__)
+        #define wxEventLoop wxConsoleEventLoop
+    #else // we still must define it somehow for the code below...
+        #define wxEventLoop wxEventLoopBase
+    #endif

 #endif
 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }
 #endif
 
 inline bool wxEventLoopBase::IsRunning() const { return GetActive() == this; }


@@ -207,7 +210,7 @@ public:
     wxEventLoopActivator(wxEventLoopBase *evtLoop)
     {
         m_evtLoopOld = wxEventLoopBase::GetActive();
     wxEventLoopActivator(wxEventLoopBase *evtLoop)
     {
         m_evtLoopOld = wxEventLoopBase::GetActive();

-        wxEventLoopBase::SetActive(wx_static_cast(wxEventLoop *, evtLoop));
+        wxEventLoopBase::SetActive(evtLoop);

     }
 
     ~wxEventLoopActivator()
     }
 
     ~wxEventLoopActivator()


@@ -217,7 +220,7 @@ public:
     }
 
 private:
     }
 
 private:

-    wxEventLoop *m_evtLoopOld;
+    wxEventLoopBase *m_evtLoopOld;

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