source id type is unsigned; minor cleanup

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 010c6316322c9e07d50f82e96bb64475481515f0..cb1d10e8c1d7790a681b2f787c6fd8f9975a0121 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKTIMERH__
-#define __GTKTIMERH__
+#ifndef _WX_GTK_TIMER_H_
+#define _WX_GTK_TIMER_H_

 
 //-----------------------------------------------------------------------------
 // wxTimer
 
 //-----------------------------------------------------------------------------
 // wxTimer


@@ -22,18 +22,17 @@ public:
         { Init(); }
     virtual ~wxTimer();
 
         { Init(); }
     virtual ~wxTimer();
 

-    virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
+    virtual bool Start(int millisecs = -1, bool oneShot = false);

     virtual void Stop();
 
     virtual void Stop();
 

-    virtual bool IsRunning() const { return m_tag != -1; }
+    virtual bool IsRunning() const { return m_sourceId != 0; }

 
 

-protected:
+private:

     void Init();
 
     void Init();
 

-    int  m_tag;
+    unsigned m_sourceId;

 
 

-private:

     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 

-#endif // __GTKTIMERH__
+#endif // _WX_GTK_TIMER_H_

diff --git a/src/gtk/timer.cpp b/src/gtk/timer.cpp
index eb7a15fbb5db874745ae9bfcea3ac22b2823926b..7bb0317952ef23068addc4b1700cae8a5b20b0e0 100644 (file)
--- a/src/gtk/timer.cpp
+++ b/src/gtk/timer.cpp
@@ -14,7 +14,7 @@
 
 #include "wx/timer.h"
 
 
 #include "wx/timer.h"
 

-#include "gtk/gtk.h"
+#include <gtk/gtk.h>

 
 // ----------------------------------------------------------------------------
 // wxTimer
 
 // ----------------------------------------------------------------------------
 // wxTimer


@@ -23,7 +23,7 @@
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 extern "C" {
 IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
 
 extern "C" {

-static gint timeout_callback( gpointer data )
+static gboolean timeout_callback(gpointer data)

 {
     wxTimer *timer = (wxTimer*)data;
 
 {
     wxTimer *timer = (wxTimer*)data;
 


@@ -45,42 +45,39 @@ static gint timeout_callback( gpointer data )
     // Release lock again.
     gdk_threads_leave();
 
     // Release lock again.
     gdk_threads_leave();
 

-    if (timer->IsOneShot())
-        return FALSE;
-
-    return TRUE;
+    return !timer->IsOneShot();

 }
 }
 
 void wxTimer::Init()
 {
 }
 }
 
 void wxTimer::Init()
 {

-    m_tag = -1;
+    m_sourceId = 0;

     m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {
     m_milli = 1000;
 }
 
 wxTimer::~wxTimer()
 {

-    wxTimer::Stop();
+    Stop();

 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     (void)wxTimerBase::Start(millisecs, oneShot);
 

-    if (m_tag != -1)
-        g_source_remove( m_tag );
+    if (m_sourceId != 0)
+        g_source_remove(m_sourceId);

 
 

-    m_tag = g_timeout_add( m_milli, timeout_callback, this );
+    m_sourceId = g_timeout_add(m_milli, timeout_callback, this);

 
 

-    return TRUE;
+    return true;

 }
 
 void wxTimer::Stop()
 {
 }
 
 void wxTimer::Stop()
 {

-    if (m_tag != -1)
+    if (m_sourceId != 0)

     {
     {

-        g_source_remove( m_tag );
-        m_tag = -1;
+        g_source_remove(m_sourceId);
+        m_sourceId = 0;

     }
 }
 
     }
 }