Mercurial > fife-parpg
comparison engine/core/gui/console/console.cpp @ 228:756b895e1dab
Merged unicode-support back into trunk.
Now all GUI/visible strings should be unicode.
Internal strings unchanged.
Remember to use a font that actually has the desired codepoints.
Current default unicode policiy is 'ignore'.
author | phoku@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Sat, 21 Mar 2009 10:38:11 +0000 |
parents | bb9902910067 |
children | 64738befdf3b |
comparison
equal
deleted
inserted
replaced
227:d642169490f7 | 228:756b895e1dab |
---|---|
36 #include "util/time/timemanager.h" | 36 #include "util/time/timemanager.h" |
37 #include "util/log/logger.h" | 37 #include "util/log/logger.h" |
38 #include "util/base/exception.h" | 38 #include "util/base/exception.h" |
39 #include "gui/guimanager.h" | 39 #include "gui/guimanager.h" |
40 #include "gui/base/gui_font.h" | 40 #include "gui/base/gui_font.h" |
41 #include "gui/widgets/utf8textbox.h" | |
41 | 42 |
42 #include "commandline.h" | 43 #include "commandline.h" |
43 #include "console.h" | 44 #include "console.h" |
44 | 45 |
45 namespace FIFE { | 46 namespace FIFE { |
48 | 49 |
49 Console::Console() | 50 Console::Console() |
50 : gcn::Container(), | 51 : gcn::Container(), |
51 m_consoleexec(0), | 52 m_consoleexec(0), |
52 m_input(new CommandLine()), | 53 m_input(new CommandLine()), |
53 m_output(new gcn::TextBox("")), | 54 m_output(new gcn::UTF8TextBox()), |
54 m_outputscrollarea(new gcn::ScrollArea(m_output)), | 55 m_outputscrollarea(new gcn::ScrollArea(m_output)), |
55 m_status(new gcn::Label()), | 56 m_status(new gcn::Label()), |
56 m_toolsbutton(new gcn::Button("Tools")) | 57 m_toolsbutton(new gcn::Button("Tools")) |
57 { | 58 { |
58 reLayout(); | 59 reLayout(); |