diff options
author | erihel <erihel@gmail.com> | 2012-08-18 21:04:51 +0200 |
---|---|---|
committer | erihel <erihel@gmail.com> | 2012-08-18 21:04:51 +0200 |
commit | 8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6 (patch) | |
tree | ffee78fc822604f9c5c3ab468c8da04862f31283 /src/ui/interface.cpp | |
parent | 48ad79a03c12b923dfdb3795a2138445859cf779 (diff) | |
download | colobot-8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6.tar.gz colobot-8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6.tar.bz2 colobot-8d4a3ed57915af2acf8b3dcd9a8aec5a75806ca6.zip |
* wrong enum used for text alignment
* wrong event function used
Diffstat (limited to 'src/ui/interface.cpp')
-rw-r--r-- | src/ui/interface.cpp | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 0398e7f..6c96501 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -72,12 +72,8 @@ template <typename T> inline T* CInterface::CreateControl(Math::Point pos, Math: { T* pc; int index; - Event event; - - if (eventMsg == EVENT_NULL) { - m_event->GetEvent(event); - eventMsg = event.type; - } + if (eventMsg == EVENT_NULL) + eventMsg = GetUniqueEventType(); if ((index = GetNextFreeControl()) < 0) return nullptr; @@ -95,12 +91,8 @@ CWindow* CInterface::CreateWindows(Math::Point pos, Math::Point dim, int icon, E { CWindow* pc; int index; - Event event; - - if (eventMsg == EVENT_NULL) { - m_event->GetEvent(event); - eventMsg = event.type; - } + if (eventMsg == EVENT_NULL) + eventMsg = GetUniqueEventType(); switch (eventMsg) { case EVENT_WINDOW0: index = 0; break; @@ -212,12 +204,8 @@ CList* CInterface::CreateList(Math::Point pos, Math::Point dim, int icon, EventT { CList* pc; int index; - Event event; - - if (eventMsg == EVENT_NULL) { - m_event->GetEvent(event); - eventMsg = event.type; - } + if (eventMsg == EVENT_NULL) + eventMsg = GetUniqueEventType(); if ((index = GetNextFreeControl()) < 0) return nullptr; |