Centre wxSlider value correctly when wxSL_MIN_MAX_LABELS is not used.

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

diff --git a/src/palmos/evtloop.cpp b/src/palmos/evtloop.cpp
index 3de13673dc5898884774af3c27b79b1b155fd45e..6b15d3d2cdcf5f88d4b9de54baa88e4a12ccb585 100644 (file)
--- a/src/palmos/evtloop.cpp
+++ b/src/palmos/evtloop.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/evtloop.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/palmos/evtloop.cpp

-// Purpose:     implements wxEventLoop for Palm OS
+// Purpose:     implements wxGUIEventLoop for Palm OS

 // Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10.14.04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10.14.04
 // RCS-ID:      $Id$
 // Copyright:   (c) William Osborne

-// License:     wxWindows licence
+// Licence:     wxWindows licence

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


@@ -33,7 +33,6 @@
 
 #include "wx/tooltip.h"
 #include "wx/except.h"
 
 #include "wx/tooltip.h"
 #include "wx/except.h"

-#include "wx/ptr_scpd.h"

 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"


@@ -51,77 +50,49 @@
 #include <Menu.h>
 #include <Form.h>
 
 #include <Menu.h>
 #include <Form.h>
 

-// ----------------------------------------------------------------------------
-// helper class
-// ----------------------------------------------------------------------------
-
-// this object sets the wxEventLoop given to the ctor as the currently active
-// one and unsets it in its dtor
-class wxEventLoopActivator
-{
-public:
-    wxEventLoopActivator(wxEventLoop **pActive,
-                         wxEventLoop *evtLoop)
-    {
-        m_pActive = pActive;
-        m_evtLoopOld = *pActive;
-        *pActive = evtLoop;
-    }
-
-    ~wxEventLoopActivator()
-    {
-        // restore the previously active event loop
-        *m_pActive = m_evtLoopOld;
-    }
-
-private:
-    wxEventLoop *m_evtLoopOld;
-    wxEventLoop **m_pActive;
-};
-

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

-// wxEventLoop implementation
+// wxGUIEventLoop implementation

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

-wxEventLoop *wxEventLoopBase::ms_activeLoop = NULL;
-

 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // ctor/dtor
 // ----------------------------------------------------------------------------
 

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

 {
     m_shouldExit = false;
     m_exitcode = 0;
 }
 
 // ----------------------------------------------------------------------------
 {
     m_shouldExit = false;
     m_exitcode = 0;
 }
 
 // ----------------------------------------------------------------------------

-// wxEventLoop message processing
+// wxGUIEventLoop message processing

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxEventLoop::ProcessMessage(WXMSG *msg)
+void wxGUIEventLoop::ProcessMessage(WXMSG *msg)

 {
 }
 
 {
 }
 

-bool wxEventLoop::PreProcessMessage(WXMSG *msg)
+bool wxGUIEventLoop::PreProcessMessage(WXMSG *msg)

 {
     return false;
 }
 
 // ----------------------------------------------------------------------------
 {
     return false;
 }
 
 // ----------------------------------------------------------------------------

-// wxEventLoop running and exiting
+// wxGUIEventLoop running and exiting

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

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

 {
     return true;
 }
 
 {
     return true;
 }
 

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

 {
     status_t    error;
     EventType    event;
 
 {
     status_t    error;
     EventType    event;
 

+    wxEventLoopActivator activate(this);
+

     do {
         wxTheApp && wxTheApp->ProcessIdle();
 
     do {
         wxTheApp && wxTheApp->ProcessIdle();
 


@@ -140,7 +111,7 @@ int wxEventLoop::Run()
     return 0;
 }
 
     return 0;
 }
 

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

 {
     FrmCloseAllForms();
 
 {
     FrmCloseAllForms();
 


@@ -150,16 +121,31 @@ void wxEventLoop::Exit(int rc)
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// wxEventLoop message processing dispatching
+// wxGUIEventLoop message processing dispatching

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

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

 {
     return false;
 }
 
 {
     return false;
 }
 

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

 {
     return false;
 }
 
 {
     return false;
 }
 

+int wxGUIEventLoop::DispatchTimeout(unsigned long timeout)
+{
+    return -1;
+}
+
+void wxGUIEventLoop::WakeUp()
+{
+    return;
+}
+
+bool wxGUIEventLoop::YieldFor(long eventsToProcess)
+{
+    return true;
+}
+