Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/x11/evtloop.cpp b/src/x11/evtloop.cpp
index 146fabde1495ee8ff7e83f2f27e7060643011c48..9c9d699571c9323bca5ec57d7dcb62783f03bcb1 100644 (file)
--- a/src/x11/evtloop.cpp
+++ b/src/x11/evtloop.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     01.06.01
 // Author:      Julian Smart
 // Modified by:
 // Created:     01.06.01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2002 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2002 Julian Smart
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -125,15 +124,10 @@ wxGUIEventLoop::~wxGUIEventLoop()
     wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );
 }
 
     wxASSERT_MSG( !m_impl, wxT("should have been deleted in Run()") );
 }
 

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

 {
 {

-    // event loops are not recursive, you need to create another loop!
-    wxCHECK_MSG( !m_impl, -1, wxT("can't reenter a message loop") );
-

     m_impl = new wxEventLoopImpl;
 
     m_impl = new wxEventLoopImpl;
 

-    wxEventLoopActivator activate(this);
-

     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {
     m_impl->m_keepGoing = true;
     while ( m_impl->m_keepGoing )
     {


@@ -167,7 +161,7 @@ int wxGUIEventLoop::Run()
     return exitcode;
 }
 
     return exitcode;
 }
 

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

 {
     if ( m_impl )
     {
 {
     if ( m_impl )
     {