Mercurial > fife-parpg

diff engine/core/gui/widgets/widgets.i @ 228:756b895e1dab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/engine/core/gui/widgets/widgets.i	Fri Mar 20 15:17:28 2009 +0000
+++ b/engine/core/gui/widgets/widgets.i	Sat Mar 21 10:38:11 2009 +0000
@@ -23,6 +23,8 @@
 %{
 #include <guichan.hpp>
 #include <guichan/mouseevent.hpp>
+#include "gui/widgets/utf8textfield.h"
+#include "gui/widgets/utf8textbox.h"
 #include "gui/widgets/twobutton.h"
 #include "gui/widgets/togglebutton.h"
 #include "gui/widgets/clicklabel.h"
@@ -154,11 +156,12 @@
 		virtual void adjustSize();
 	};
 
-	%feature("notabstract") TextField;
-	class TextField: public Widget {
+	%feature("notabstract") UTF8TextField;
+	%rename(TextField) UTF8TextField;
+	class UTF8TextField: public Widget {
 	public:
-		TextField();
-		TextField(const std::string& text);
+		UTF8TextField();
+		UTF8TextField(const std::string& text);
 		virtual void setText(const std::string& text);
 		virtual const std::string& getText() const;
 		virtual void adjustSize();
@@ -263,11 +266,12 @@
 	};
 	
 	
-	%feature("notabstract") TextBox;
-	class TextBox: public Widget {
+	%feature("notabstract") UTF8TextBox;
+	%rename(TextBox) UTF8TextBox;
+	class UTF8TextBox: public Widget {
 	public:
-		TextBox();
-		TextBox(const std::string& text);
+		UTF8TextBox();
+		UTF8TextBox(const std::string& text);
 		virtual void setText(const std::string& text);
 		virtual std::string getText() const;
 		virtual const std::string& getTextRow(int row) const;