From bb94a1c1906de4b7d71690f15f05f5fe9fbdb444 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Thu, 22 Dec 2011 22:26:42 +0100 Subject: Changed INT and DELETE enum names to fix C::B compilation. This was introduced since Crush updated his mana lib pack. I simply changed the names to avoid a collision. Reviewed-by: Ablu. --- src/gui/sdlinput.cpp | 2 +- src/gui/sdlinput.h | 2 +- src/gui/widgets/inttextfield.cpp | 2 +- src/gui/widgets/textfield.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui') diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp index 19f64a16..7f753b49 100644 --- a/src/gui/sdlinput.cpp +++ b/src/gui/sdlinput.cpp @@ -274,7 +274,7 @@ int SDLInput::convertKeyCharacter(SDL_Event event) value = Key::ESCAPE; break; case SDLK_DELETE: - value = Key::DELETE; + value = Key::DELETE_KEY; break; case SDLK_INSERT: value = Key::INSERT; diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h index b441380a..fe4ff4bb 100644 --- a/src/gui/sdlinput.h +++ b/src/gui/sdlinput.h @@ -88,7 +88,7 @@ namespace Key INSERT, HOME, PAGE_UP, - DELETE, + DELETE_KEY, END, PAGE_DOWN, ESCAPE, diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp index fb02eae3..9e2182bd 100644 --- a/src/gui/widgets/inttextfield.cpp +++ b/src/gui/widgets/inttextfield.cpp @@ -37,7 +37,7 @@ void IntTextField::keyPressed(gcn::KeyEvent &event) const gcn::Key &key = event.getKey(); if (key.getValue() == Key::BACKSPACE || - key.getValue() == Key::DELETE) + key.getValue() == Key::DELETE_KEY) { setText(std::string()); event.consume(); diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index d06df376..6da69a76 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -248,7 +248,7 @@ void TextField::keyPressed(gcn::KeyEvent &keyEvent) } } break; - case Key::DELETE: + case Key::DELETE_KEY: { unsigned sz = mText.size(); while (mCaretPosition < sz) -- cgit v1.2.3-70-g09d2