X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fevent-receiver.h;h=516c7b57dd5cc6c41ff72c51e52187c4009268a2;hb=85623b0c003e4938263a3431b45837050f044593;hp=c3bc67d3d0d36c527276fe44448941b27012b8b3;hpb=b6dc1786bc0cf88d56dfe5f307ce7eb873fe6874;p=guile-irrlicht.git

diff --git a/src/event-receiver.h b/src/event-receiver.h
index c3bc67d..516c7b5 100644
--- a/src/event-receiver.h
+++ b/src/event-receiver.h
@@ -24,37 +24,34 @@
 
 #include <irrlicht/irrlicht.h>
 #include <libguile.h>
-#include "wrapped.h"
 
-extern "C" {
-
-  void
-  init_event_receiver (void);
-
-  DECLARE_WRAPPED_TYPE (irr::IEventReceiver*, init_event_receiver_type,
-                        event_receiver_p, wrap_event_receiver, unwrap_event_receiver);
+SCM
+IEventRecevier_make (SCM proc_on_event);
 
-  DECLARE_WRAPPED_TYPE (irr::SEvent*, init_event_type,
-                        event_p, wrap_event, unwrap_event);
+SCM
+SEvent_EventType (SCM event);
 
-  SCM
-  event_gui_caller (SCM event);
+SCM
+SEvent_SGUIEvent_Caller (SCM event);
 
-  SCM
-  event_key_input_key (SCM event);
+SCM
+SEvent_SGUIEvent_EventType (SCM event);
 
-  SCM
-  event_key_input_pressed (SCM event);
+SCM
+SEvent_SKeyInput_Key (SCM event);
 
-  SCM
-  event_type (SCM event);
+SCM
+SEvent_SKeyInput_PressedDown (SCM event);
 
-  SCM
-  make_event_receiver (SCM proc_on_event);
+extern "C" {
+  void
+  init_event_receiver (void);
+}
 
-  SCM
-  scm_from_event_type (irr::EEVENT_TYPE event_type);
+SCM
+scm_from_event_type (irr::EEVENT_TYPE event_type);
 
-}
+SCM
+scm_from_gui_event_type (irr::gui::EGUI_EVENT_TYPE gui_event_type);
 
 #endif