X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fevent-receiver.cpp;h=12ff718059404c901409f46f62a0a0e1518cac8b;hb=c59d2be798005a3684d75c3f561568ad2cdac9c7;hp=293f48f794f1a6b028003aa50c9b5ad2d438f11e;hpb=19663b6c5766b06c73148fdf803ce3555052a23e;p=guile-irrlicht.git

diff --git a/src/event-receiver.cpp b/src/event-receiver.cpp
index 293f48f..12ff718 100644
--- a/src/event-receiver.cpp
+++ b/src/event-receiver.cpp
@@ -24,11 +24,10 @@
 #include "event-receiver.h"
 #include "gsubr.h"
 #include "keycodes.h"
-
+#include "wrapped.h"
 
 using namespace irr;
 
-
 SCM
 IEventRecevier_make (SCM proc_on_event)
 {
@@ -52,61 +51,51 @@ IEventRecevier_make (SCM proc_on_event)
   return scm_from_pointer ((void*)receiver, NULL);
 }
 
-
 SCM
 SEvent_EventType (SCM event)
 {
   return scm_from_event_type
-    (((SEvent*)scm_to_pointer (event))->EventType);
+    (((SEvent*)scm_to_irr_pointer (event))->EventType);
 }
 
-
 SCM
 SEvent_SGUIEvent_Caller (SCM event)
 {
   gui::IGUIElement* caller =
-    ((SEvent*)scm_to_pointer (event))->GUIEvent.Caller;
+    ((SEvent*)scm_to_irr_pointer (event))->GUIEvent.Caller;
   return scm_from_pointer ((void*)caller, NULL);
 }
 
-
 SCM
 SEvent_SGUIEvent_EventType (SCM event)
 {
   return scm_from_gui_event_type
-    (((SEvent*)scm_to_pointer (event))->GUIEvent.EventType);
+    (((SEvent*)scm_to_irr_pointer (event))->GUIEvent.EventType);
 }
 
-
 SCM
 SEvent_SKeyInput_Key (SCM event)
 {
   return scm_from_key_code
-    (((SEvent*)scm_to_pointer (event))->KeyInput.Key);
+    (((SEvent*)scm_to_irr_pointer (event))->KeyInput.Key);
 }
 
-
 SCM
 SEvent_SKeyInput_PressedDown (SCM event)
 {
   return scm_from_bool
-    (((SEvent*)scm_to_pointer (event))->KeyInput.PressedDown);
+    (((SEvent*)scm_to_irr_pointer (event))->KeyInput.PressedDown);
 }
 
-
-extern "C" {
-
-  void
-  init_event_receiver (void)
-  {
-    DEFINE_GSUBR ("IEventRecevier_make", 1, 0, 0, IEventRecevier_make);
-    DEFINE_GSUBR ("SEvent_EventType", 1, 0, 0, SEvent_EventType);
-    DEFINE_GSUBR ("SEvent_SGUIEvent_Caller", 1, 0, 0, SEvent_SGUIEvent_Caller);
-    DEFINE_GSUBR ("SEvent_SGUIEvent_EventType", 1, 0, 0, SEvent_SGUIEvent_EventType);
-    DEFINE_GSUBR ("SEvent_SKeyInput_Key", 1, 0, 0, SEvent_SKeyInput_Key);
-    DEFINE_GSUBR ("SEvent_SKeyInput_PressedDown", 1, 0, 0, SEvent_SKeyInput_PressedDown);
-  }
-
+void
+init_event_receiver (void)
+{
+  DEFINE_GSUBR ("IEventRecevier_make", 1, 0, 0, IEventRecevier_make);
+  DEFINE_GSUBR ("SEvent_EventType", 1, 0, 0, SEvent_EventType);
+  DEFINE_GSUBR ("SEvent_SGUIEvent_Caller", 1, 0, 0, SEvent_SGUIEvent_Caller);
+  DEFINE_GSUBR ("SEvent_SGUIEvent_EventType", 1, 0, 0, SEvent_SGUIEvent_EventType);
+  DEFINE_GSUBR ("SEvent_SKeyInput_Key", 1, 0, 0, SEvent_SKeyInput_Key);
+  DEFINE_GSUBR ("SEvent_SKeyInput_PressedDown", 1, 0, 0, SEvent_SKeyInput_PressedDown);
 }
 
 SCM
@@ -145,7 +134,6 @@ scm_from_event_type (EEVENT_TYPE event_type)
     }
 }
 
-
 SCM
 scm_from_gui_event_type (gui::EGUI_EVENT_TYPE gui_event_type)
 {