summaryrefslogtreecommitdiff
path: root/src/interface/Window.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-01-30 00:40:28 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-01-30 00:40:28 (GMT)
commit259fc2bcf75d754af043a5d3fa39b6ee0c0b1dec (patch)
treef0fe2c14499345121371bba0ecc3fe21d17e0953 /src/interface/Window.cpp
parentfe329e9127ebcb8c89c505c4c120e175810d280c (diff)
downloadpowder-259fc2bcf75d754af043a5d3fa39b6ee0c0b1dec.zip
powder-259fc2bcf75d754af043a5d3fa39b6ee0c0b1dec.tar.gz
ASCII for key events, save and Textarea (no caret, yet)
Diffstat (limited to 'src/interface/Window.cpp')
-rw-r--r--src/interface/Window.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interface/Window.cpp b/src/interface/Window.cpp
index b399ab8..5b603b9 100644
--- a/src/interface/Window.cpp
+++ b/src/interface/Window.cpp
@@ -140,28 +140,28 @@ void Window::DoTick(float dt)
OnTick(dt);
}
-void Window::DoKeyPress(int key, bool shift, bool ctrl, bool alt)
+void Window::DoKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
//on key press
if(focusedComponent_ != NULL)
{
if(!focusedComponent_->Locked)
- focusedComponent_->OnKeyPress(key, shift, ctrl, alt);
+ focusedComponent_->OnKeyPress(key, character, shift, ctrl, alt);
}
- OnKeyPress(key, shift, ctrl, alt);
+ OnKeyPress(key, character, shift, ctrl, alt);
}
-void Window::DoKeyRelease(int key, bool shift, bool ctrl, bool alt)
+void Window::DoKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
//on key unpress
if(focusedComponent_ != NULL)
{
if(!focusedComponent_->Locked)
- focusedComponent_->OnKeyRelease(key, shift, ctrl, alt);
+ focusedComponent_->OnKeyRelease(key, character, shift, ctrl, alt);
}
- OnKeyRelease(key, shift, ctrl, alt);
+ OnKeyRelease(key, character, shift, ctrl, alt);
}
void Window::DoMouseDown(int x_, int y_, unsigned button)