projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
escape underscores and don't use abbreviations in text
[wxWidgets.git]
/
src
/
gtk
/
timer.cpp
diff --git
a/src/gtk/timer.cpp
b/src/gtk/timer.cpp
index 3b28f1d1c22251fc1d84e71ea59ba9556a9a4cf1..109a47d09a3f5f64abe02d4b8affa81597116c99 100644
(file)
--- a/
src/gtk/timer.cpp
+++ b/
src/gtk/timer.cpp
@@
-7,11
+7,6
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "timer.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-27,7
+22,8
@@
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxEvtHandler)
-extern "C" gint timeout_callback( gpointer data )
+extern "C" {
+static gint timeout_callback( gpointer data )
{
wxTimer *timer = (wxTimer*)data;
{
wxTimer *timer = (wxTimer*)data;
@@
-54,6
+50,7
@@
extern "C" gint timeout_callback( gpointer data )
return TRUE;
}
return TRUE;
}
+}
void wxTimer::Init()
{
void wxTimer::Init()
{