Merge branch 'textboxdev' into 'master'

TextBox develop.

See merge request crupest/CruUI!2

1 files changed, 17 insertions, 0 deletions

diff --git a/CruUI/ui/control.h b/CruUI/ui/control.h
index 78261a80..d6cbae40 100644
--- a/CruUI/ui/control.h
+++ b/CruUI/ui/control.h
@@ -214,6 +214,10 @@ namespace cru
             //Raised when a mouse button is pressed in the control and released in the control with mouse not leaving it between two operations.
             events::MouseButtonEvent mouse_click_event;
 
+            events::KeyEvent key_down_event;
+            events::KeyEvent key_up_event;
+            events::CharEvent char_event;
+
             events::FocusChangeEvent get_focus_event;
             events::FocusChangeEvent lose_focus_event;
 
@@ -278,6 +282,19 @@ namespace cru
             virtual void OnMouseClickBegin(MouseButton button);
             virtual void OnMouseClickEnd(MouseButton button);
 
+            //*************** region: keyboard event ***************
+            virtual void OnKeyDown(events::KeyEventArgs& args);
+            virtual void OnKeyUp(events::KeyEventArgs& args);
+            virtual void OnChar(events::CharEventArgs& args);
+
+            virtual void OnKeyDownCore(events::KeyEventArgs& args);
+            virtual void OnKeyUpCore(events::KeyEventArgs& args);
+            virtual void OnCharCore(events::CharEventArgs& args);
+
+            void RaiseKeyDownEvent(events::KeyEventArgs& args);
+            void RaiseKeyUpEvent(events::KeyEventArgs& args);
+            void RaiseCharEvent(events::CharEventArgs& args);
+
             //*************** region: focus event ***************
             virtual void OnGetFocus(events::FocusChangeEventArgs& args);
             virtual void OnLoseFocus(events::FocusChangeEventArgs& args);