summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-12-22 22:26:42 +0100
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2012-01-09 07:00:17 +0100
commitbb94a1c1906de4b7d71690f15f05f5fe9fbdb444 (patch)
treec3d886d4e6d6bdcb74e548ecf4dd346cd425c173 /src/gui
parent9a702e64449ba54fab28706c5b9c5ff9f2a41f8a (diff)
downloadMana-bb94a1c1906de4b7d71690f15f05f5fe9fbdb444.tar.gz
Mana-bb94a1c1906de4b7d71690f15f05f5fe9fbdb444.tar.bz2
Mana-bb94a1c1906de4b7d71690f15f05f5fe9fbdb444.tar.xz
Mana-bb94a1c1906de4b7d71690f15f05f5fe9fbdb444.zip
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.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/sdlinput.cpp2
-rw-r--r--src/gui/sdlinput.h2
-rw-r--r--src/gui/widgets/inttextfield.cpp2
-rw-r--r--src/gui/widgets/textfield.cpp2
4 files changed, 4 insertions, 4 deletions
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)