diff options
| author | adiblol <adiblol@chommik.eu> | 2012-09-27 23:55:13 +0200 |
|---|---|---|
| committer | adiblol <adiblol@chommik.eu> | 2012-09-27 23:55:13 +0200 |
| commit | 77952a85e63ca13dd9cfc93c7b6a271d7c91e59a (patch) | |
| tree | acec920fff5f86b2776bab9e1e4ea9921115ecaa /src/ui/edit.h | |
| parent | 6d0ed0d26aebead7c79e4fb97c6962e06e7dcb41 (diff) | |
| parent | 9f4c1454dc75d697b43a634927ebcfd6186a4e93 (diff) | |
| download | colobot-77952a85e63ca13dd9cfc93c7b6a271d7c91e59a.tar.gz colobot-77952a85e63ca13dd9cfc93c7b6a271d7c91e59a.tar.bz2 colobot-77952a85e63ca13dd9cfc93c7b6a271d7c91e59a.zip | |
Merge remote-tracking branch 'origin/dev' into dev-graphics
Diffstat (limited to 'src/ui/edit.h')
| -rw-r--r-- | src/ui/edit.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/edit.h b/src/ui/edit.h index c5c6cf6..7414372 100644 --- a/src/ui/edit.h +++ b/src/ui/edit.h @@ -35,7 +35,7 @@ #include "common/iman.h" #include "common/restext.h" -#include <vector> +#include <set> @@ -240,7 +240,7 @@ protected: int m_maxChar; // max length of the buffer m_text char* m_text; // text (without zero terminator) - std::vector<Gfx::FontMetaChar> m_format; // format characters + std::map<unsigned int, Gfx::FontMetaChar> m_format; // format characters int m_len; // length used in m_text int m_cursor1; // offset cursor int m_cursor2; // offset cursor |