reSWIGged

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

diff --git a/src/gtk1/timer.cpp b/src/gtk1/timer.cpp
index 0353bede8b243199015360d781ae7d88f23642c0..e004d2d4bea293908db6fb21824c1f23a1ead528 100644 (file)
--- a/src/gtk1/timer.cpp
+++ b/src/gtk1/timer.cpp
@@ -25,9 +25,10 @@
 // wxTimer
 // ----------------------------------------------------------------------------
 
 // wxTimer
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
+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 +55,7 @@ extern "C" gint timeout_callback( gpointer data )
 
     return TRUE;
 }
 
     return TRUE;
 }

+}

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