Move methods from EventHandler
to Window
class
#1235
Merged
EventHandler
to Window
class
#1235