Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / event-handler.h

diff --git a/dali/internal/window-system/common/event-handler.h b/dali/internal/window-system/common/event-handler.h
old mode 100755 (executable)
new mode 100644 (file)
index 795a919..71f4ca5
--- a/dali/internal/window-system/common/event-handler.h
+++ b/dali/internal/window-system/common/event-handler.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_EVENT_HANDLER_H
 
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ public:
   /**
    * Destructor.
    */
-  ~EventHandler();
+  ~EventHandler() override;
 
   /**
    * Called when the adaptor is paused.
@@ -166,7 +166,7 @@ private:
   /**
    * Called when a mouse wheel is received.
    */
-  void OnWheelEvent( WheelEvent& wheelEvent );
+  void OnWheelEvent( Integration::WheelEvent& wheelEvent );
 
   /**
    * Called when a key event is received.