Corrected memory.cpp compilation error; Cygwin makefile uses generic wxDirDlg

[wxWidgets.git] / src / gtk1 / timer.cpp

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 61de7eeb1116a45720ee69eb3f1d52792a40683d..36aada6e6fc9c92920245527a2b1ca33c5c45163 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -14,6 +14,8 @@
 
 #include "wx/timer.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
@@ -22,46 +24,49 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer,wxObject)
 
 gint timeout_callback( gpointer data )
 {
-  wxTimer *timer = (wxTimer*)data;
-  timer->Notify();
+    wxTimer *timer = (wxTimer*)data;
+    timer->Notify();
 
-  if ( timer->OneShot() )
-    timer->Stop();
+    if (timer->OneShot())
+    {
+        timer->Stop();
+    }
 
-  return TRUE;
+    return TRUE;
 }
 
 wxTimer::wxTimer()
 {
-  m_tag = -1;
-  m_time = 1000;
-  m_oneShot = FALSE;
+    m_tag = -1;
+    m_time = 1000;
+    m_oneShot = FALSE;
 }
 
 wxTimer::~wxTimer()
 {
-  Stop();
+    Stop();
 }
 
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
-  if ( millisecs != -1 )
-    m_time = millisecs;
+    if (millisecs != -1)
+    {
+        m_time = millisecs;
+    }
 
-  m_oneShot = oneShot;
+    m_oneShot = oneShot;
 
-  m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
+    m_tag = gtk_timeout_add( millisecs, timeout_callback, this );
 
-  return TRUE;
+    return TRUE;
 }
 
 void wxTimer::Stop()
 {
-  if ( m_tag != -1 )
-  {
-    gtk_timeout_remove( m_tag );
-
-    m_tag = -1;
-  }
+    if (m_tag != -1)
+    {
+        gtk_timeout_remove( m_tag );
+        m_tag = -1;
+    }
 }