add wxScrollHelper::ShowScrollbars() (implemented for GTK only right now, generic...

[wxWidgets.git] / src / dfb / evtloop.cpp

diff --git a/src/dfb/evtloop.cpp b/src/dfb/evtloop.cpp
index 16a348110b1dfea229ebeaecc650f805c5240c1b..6c6bef402dda24966606669626cb08e6b594eae1 100644 (file)
--- a/src/dfb/evtloop.cpp
+++ b/src/dfb/evtloop.cpp
@@ -27,11 +27,11 @@
 
 #include "wx/thread.h"
 #include "wx/generic/private/timer.h"
 
 #include "wx/thread.h"
 #include "wx/generic/private/timer.h"

-#include "wx/private/selectdispatcher.h"
+#include "wx/private/fdiodispatcher.h"

 #include "wx/dfb/private.h"
 #include "wx/nonownedwnd.h"
 
 #include "wx/dfb/private.h"
 #include "wx/nonownedwnd.h"
 

-#define TRACE_EVENTS _T("events")
+#define TRACE_EVENTS "events"

 
 // ===========================================================================
 // implementation
 
 // ===========================================================================
 // implementation


@@ -41,28 +41,28 @@
 // wxEventLoop initialization
 //-----------------------------------------------------------------------------
 
 // wxEventLoop initialization
 //-----------------------------------------------------------------------------
 

-wxIDirectFBEventBufferPtr wxEventLoop::ms_buffer;
+wxIDirectFBEventBufferPtr wxGUIEventLoop::ms_buffer;

 
 

-wxEventLoop::wxEventLoop()
+wxGUIEventLoop::wxGUIEventLoop()

 {
     if ( !ms_buffer )
         InitBuffer();
 }
 
 /* static */
 {
     if ( !ms_buffer )
         InitBuffer();
 }
 
 /* static */

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

 {
     ms_buffer = wxIDirectFB::Get()->CreateEventBuffer();
 }
 
 /* static */
 {
     ms_buffer = wxIDirectFB::Get()->CreateEventBuffer();
 }
 
 /* static */

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

 {
     ms_buffer.Reset();
 }
 
 /* static */
 {
     ms_buffer.Reset();
 }
 
 /* static */

-wxIDirectFBEventBufferPtr wxEventLoop::GetDirectFBEventBuffer()
+wxIDirectFBEventBufferPtr wxGUIEventLoop::GetDirectFBEventBuffer()

 {
     if ( !ms_buffer )
         InitBuffer();
 {
     if ( !ms_buffer )
         InitBuffer();


@@ -74,16 +74,16 @@ wxIDirectFBEventBufferPtr wxEventLoop::GetDirectFBEventBuffer()
 // events dispatch and loop handling
 //-----------------------------------------------------------------------------
 
 // events dispatch and loop handling
 //-----------------------------------------------------------------------------
 

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

 {
 {

-    wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") );
+    wxCHECK_MSG( ms_buffer, false, "invalid event buffer" );

 
     return ms_buffer->HasEvent();
 }
 
 
     return ms_buffer->HasEvent();
 }
 

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

 {
 {

-    wxCHECK_MSG( ms_buffer, false, _T("invalid event buffer") );
+    wxCHECK_MSG( ms_buffer, false, "invalid event buffer" );

 
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that
 
     // NB: we don't block indefinitely waiting for an event, but instead
     //     time out after a brief period in order to make sure that


@@ -126,14 +126,14 @@ bool wxEventLoop::Dispatch()
     return true;
 }
 
     return true;
 }
 

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

 {
 {

-    wxCHECK_RET( ms_buffer, _T("invalid event buffer") );
+    wxCHECK_RET( ms_buffer, "invalid event buffer" );

 
     ms_buffer->WakeUp();
 }
 
 
     ms_buffer->WakeUp();
 }
 

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

 {
 #if wxUSE_TIMER
     wxGenericTimerImpl::NotifyTimers();
 {
 #if wxUSE_TIMER
     wxGenericTimerImpl::NotifyTimers();


@@ -141,11 +141,11 @@ void wxEventLoop::OnNextIteration()
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:
 
 #if wxUSE_SOCKETS
     // handle any pending socket events:

-    wxSelectDispatcher::Get().RunLoop(0);
+    wxFDIODispatcher::DispatchPending();

 #endif
 }
 
 #endif
 }
 

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

 {
     // process all pending events:
     while ( Pending() )
 {
     // process all pending events:
     while ( Pending() )


@@ -160,7 +160,7 @@ void wxEventLoop::Yield()
 // DirectFB -> wxWidgets events translation
 //-----------------------------------------------------------------------------
 
 // DirectFB -> wxWidgets events translation
 //-----------------------------------------------------------------------------
 

-void wxEventLoop::HandleDFBEvent(const wxDFBEvent& event)
+void wxGUIEventLoop::HandleDFBEvent(const wxDFBEvent& event)

 {
     switch ( event.GetClass() )
     {
 {
     switch ( event.GetClass() )
     {


@@ -179,7 +179,7 @@ void wxEventLoop::HandleDFBEvent(const wxDFBEvent& event)
 #endif
         {
             wxLogTrace(TRACE_EVENTS,
 #endif
         {
             wxLogTrace(TRACE_EVENTS,

-                       _T("ignoring event of unsupported class %i"),
+                       "ignoring event of unsupported class %i",

                        (int)event.GetClass());
         }
     }
                        (int)event.GetClass());
         }
     }