Changeset 505 for trunk/src/core/io_event.cc

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

• trunk/src/core/io_event.cc (modified) (1 diff)

trunk/src/core/io_event.cc

@@ -71 +71 @@
 
         db->create_type<key_event>()
-                .field( "ascii",   &key_event::ascii )
-                .field( "code",    &key_event::code )
-                .field( "shift",   &key_event::shift )
-                .field( "control", &key_event::control )
-                .field( "alt",     &key_event::alt )
-                .field( "pressed", &key_event::pressed );
+                .field( "window_id",&key_event::window_id )
+                .field( "ascii",    &key_event::ascii )
+                .field( "code",     &key_event::code )
+                .field( "shift",    &key_event::shift )
+                .field( "control",  &key_event::control )
+                .field( "alt",      &key_event::alt )
+                .field( "pressed",  &key_event::pressed );
 
         db->create_type<mouse_button_event>()
-                .field( "x",       &mouse_button_event::x )
-                .field( "y",       &mouse_button_event::y )
-                .field( "button",  &mouse_button_event::button )
-                .field( "pressed", &mouse_button_event::pressed )
-                .field( "code",    &mouse_button_event::code );
+                .field( "window_id",&mouse_button_event::window_id )
+                .field( "x",        &mouse_button_event::x )
+                .field( "y",        &mouse_button_event::y )
+                .field( "button",   &mouse_button_event::button )
+                .field( "pressed",  &mouse_button_event::pressed )
+                .field( "code",     &mouse_button_event::code );
 
         db->create_type<mouse_move_event>()
-                .field( "x",       &mouse_move_event::x )
-                .field( "y",       &mouse_move_event::y )
-                .field( "rx",      &mouse_move_event::rx )
-                .field( "ry",      &mouse_move_event::ry )
-                .field( "pressed", &mouse_move_event::pressed )
-                .field( "code",    &mouse_move_event::code );
+                .field( "window_id",&mouse_move_event::window_id )
+                .field( "x",        &mouse_move_event::x )
+                .field( "y",        &mouse_move_event::y )
+                .field( "rx",       &mouse_move_event::rx )
+                .field( "ry",       &mouse_move_event::ry )
+                .field( "pressed",  &mouse_move_event::pressed )
+                .field( "code",     &mouse_move_event::code );
 
         db->create_type<mouse_wheel_event>()
-                .field( "x",       &mouse_wheel_event::x )
-                .field( "y",       &mouse_wheel_event::y );
+                .field( "window_id",&mouse_wheel_event::window_id )
+                .field( "x",        &mouse_wheel_event::x )
+                .field( "y",        &mouse_wheel_event::y );
 
         db->create_type<pad_button_event>()