comparison engine/core/gui/widgets/widgets.i @ 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 3fb17daa1b27
children d76169461729
comparison
equal deleted inserted replaced
227:d642169490f7 228:756b895e1dab
21 21
22 %module fife 22 %module fife
23 %{ 23 %{
24 #include <guichan.hpp> 24 #include <guichan.hpp>
25 #include <guichan/mouseevent.hpp> 25 #include <guichan/mouseevent.hpp>
26 #include "gui/widgets/utf8textfield.h"
27 #include "gui/widgets/utf8textbox.h"
26 #include "gui/widgets/twobutton.h" 28 #include "gui/widgets/twobutton.h"
27 #include "gui/widgets/togglebutton.h" 29 #include "gui/widgets/togglebutton.h"
28 #include "gui/widgets/clicklabel.h" 30 #include "gui/widgets/clicklabel.h"
29 #include "gui/widgets/icon2.hpp" 31 #include "gui/widgets/icon2.hpp"
30 %} 32 %}
152 virtual const std::string &getCaption() const; 154 virtual const std::string &getCaption() const;
153 virtual void setCaption(const std::string& caption); 155 virtual void setCaption(const std::string& caption);
154 virtual void adjustSize(); 156 virtual void adjustSize();
155 }; 157 };
156 158
157 %feature("notabstract") TextField; 159 %feature("notabstract") UTF8TextField;
158 class TextField: public Widget { 160 %rename(TextField) UTF8TextField;
159 public: 161 class UTF8TextField: public Widget {
160 TextField(); 162 public:
161 TextField(const std::string& text); 163 UTF8TextField();
164 UTF8TextField(const std::string& text);
162 virtual void setText(const std::string& text); 165 virtual void setText(const std::string& text);
163 virtual const std::string& getText() const; 166 virtual const std::string& getText() const;
164 virtual void adjustSize(); 167 virtual void adjustSize();
165 virtual void adjustHeight(); 168 virtual void adjustHeight();
166 virtual void setCaretPosition(unsigned int position); 169 virtual void setCaretPosition(unsigned int position);
261 SHOW_AUTO 264 SHOW_AUTO
262 }; 265 };
263 }; 266 };
264 267
265 268
266 %feature("notabstract") TextBox; 269 %feature("notabstract") UTF8TextBox;
267 class TextBox: public Widget { 270 %rename(TextBox) UTF8TextBox;
268 public: 271 class UTF8TextBox: public Widget {
269 TextBox(); 272 public:
270 TextBox(const std::string& text); 273 UTF8TextBox();
274 UTF8TextBox(const std::string& text);
271 virtual void setText(const std::string& text); 275 virtual void setText(const std::string& text);
272 virtual std::string getText() const; 276 virtual std::string getText() const;
273 virtual const std::string& getTextRow(int row) const; 277 virtual const std::string& getTextRow(int row) const;
274 virtual void setTextRow(int row, const std::string& text); 278 virtual void setTextRow(int row, const std::string& text);
275 virtual unsigned int getNumberOfRows() const; 279 virtual unsigned int getNumberOfRows() const;