Changeset 643 for abuse/trunk/src/imlib/input.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/imlib/input.cpp (modified) (7 diffs)

abuse/trunk/src/imlib/input.cpp

@@ -113 +113 @@
 }
 
-void button_box::handle_event(event &ev, image *screen, InputManager *im)
+void button_box::handle_event(Event &ev, image *screen, InputManager *im)
 {
   switch (ev.type)
@@ -268 +268 @@
 }
 
-void text_field::handle_event(event &ev, image *screen, InputManager *im)
+void text_field::handle_event(Event &ev, image *screen, InputManager *im)
 {
   int xx;
@@ -293 +293 @@
            draw_text(screen);
            draw_cur(wm->bright_color(),screen);
-           wm->push_event(new event(id,(char *)this));
+           wm->Push(new Event(id,(char *)this));
          } break;
       default : if (ev.key>=' ' && ev.key<='~')
@@ -306 +306 @@
            draw_text(screen);
            draw_cur(wm->bright_color(),screen);
-           wm->push_event(new event(id,(char *)this));
+           wm->Push(new Event(id,(char *)this));
          } break;
     }
@@ -366 +366 @@
 { up=!up; }
 
-void button::handle_event(event &ev, image *screen, InputManager *im)
+void button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -376 +376 @@
     draw_first(screen);
     draw(act,screen);
-    wm->push_event(new event(id,(char *)this));
+    wm->Push(new Event(id,(char *)this));
   }
 }
@@ -385 +385 @@
   area(x1,y1,x2,y2);
   if (active!=act  && act_id!=-1 && active)
-    wm->push_event(new event(act_id,NULL));
+    wm->Push(new Event(act_id,NULL));
 
   if (pressed)