Changeset 643 for abuse/trunk/src/gui.cppTweet

Timestamp:

May 13, 2011, 9:13:53 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor Event and EventHandler?.

File:

• abuse/trunk/src/gui.cpp (modified) (5 diffs)

abuse/trunk/src/gui.cpp

@@ -73 +73 @@
 }
 
-void ico_switch_button::handle_event(event &ev, image *screen, InputManager *im)
+void ico_switch_button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -92 +92 @@
 
   if (active!=act  && activate_id!=-1 && active)
-    wm->push_event(new event(activate_id,NULL));
+    wm->Push(new Event(activate_id,NULL));
 
   if (up && !active)
@@ -103 +103 @@
 
   if (act!=active && active && activate_id!=-1)
-    wm->push_event(new event(activate_id,NULL));
+    wm->Push(new Event(activate_id,NULL));
   act=active;
 
@@ -121 +121 @@
 extern int sfx_volume;
 
-void ico_button::handle_event(event &ev, image *screen, InputManager *im)
+void ico_button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -130 +130 @@
     up=!up;
     draw(act,screen);
-    wm->push_event(new event(id,(char *)this));
+    wm->Push(new Event(id,(char *)this));
     if (S_BUTTON_PRESS_SND)
       cache.sfx(S_BUTTON_PRESS_SND)->play(sfx_volume);