diff --git a/ext/fox16/FXRuby.cpp b/ext/fox16/FXRuby.cpp
index 318b0b6c832c1ac325508ab91ef2c10ad3360c3b..3fde2077e2b5418a1c97e0ba352fe12d6b9fbaac 100644
--- a/ext/fox16/FXRuby.cpp
+++ b/ext/fox16/FXRuby.cpp
@@ -1484,10 +1484,10 @@ FXFoldingItem* FXRbCallFoldingItemMethod(const FXFoldingList* recv,ID func,FXint
 
 //----------------------------------------------------------------------
 
-FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const char* pathname){
+FXFileAssoc* FXRbCallFileAssocMethod(const FXFileDict* recv,ID func,const FXchar* pathname){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,func,1,rb_str_new2(pathname));
+  VALUE result=rb_funcall(obj,func,1,to_ruby(pathname));
   return NIL_P(result) ? 0 : reinterpret_cast<FXFileAssoc*>(DATA_PTR(result));
   }
 
@@ -1996,6 +1996,8 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Finished destroying objects that hold references to the FXApp.\n",__FILE__,__LINE__));
   }
 
+int utf8_enc_idx;
+
 //----------------------------------------------------------------------
 
 extern "C" void Init_core(void);
@@ -2051,6 +2053,9 @@ Init_fox16(void) {
   id_begin=rb_intern("begin");
   id_end=rb_intern("end");
   id_exclude_endp=rb_intern("exclude_end?");
+#ifdef HAVE_RUBY_ENCODING_H
+  utf8_enc_idx = rb_enc_find_index("UTF-8");
+#endif
 
   FXRuby_Objects=st_init_numtable();
   appSensitiveObjs=st_init_numtable();
diff --git a/ext/fox16/include/FXRbCommon.h b/ext/fox16/include/FXRbCommon.h
index 0d03f71bc5040a459fadedb10a97eec43e4ea103..2e76475a0a3c98d05a3e23477ec95f7914281a69 100644
--- a/ext/fox16/include/FXRbCommon.h
+++ b/ext/fox16/include/FXRbCommon.h
@@ -26,6 +26,10 @@
 
 extern "C" {
 #include "ruby.h"
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#endif
 }
 
 /**
diff --git a/ext/fox16/include/FXRbDC.h b/ext/fox16/include/FXRbDC.h
index 813b4e38c3c94b0b28fefbd957215f5541b5a47b..35bf11a6f14f841f1ce102fdb92f57cb07142abf 100644
--- a/ext/fox16/include/FXRbDC.h
+++ b/ext/fox16/include/FXRbDC.h
@@ -329,16 +329,16 @@ inline void klass ## _clipChildren(klass* self,FXbool yes){ \
     FXRbCallVoidMethod(this,rb_intern("drawIconSunken"),icon,dx,dy); \
     } \
   void cls::drawText(FXint x,FXint y,const FXString& string){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),rb_str_new(string.text(),string.length())); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),to_ruby(string)); \
     } \
   void cls::drawText(FXint x,FXint y,const FXchar* string,FXuint length){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawText"),3,to_ruby(x),to_ruby(y),to_ruby(string,length)); \
     } \
   void cls::drawImageText(FXint x,FXint y,const FXString& string){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),rb_str_new(string.text(),string.length())); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),to_ruby(string)); \
     } \
   void cls::drawImageText(FXint x,FXint y,const FXchar* string,FXuint length){ \
-    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),rb_str_new(string,length)); \
+    rb_funcall(FXRbGetRubyObj(this,false),rb_intern("drawImageText"),3,to_ruby(x),to_ruby(y),to_ruby(string,length)); \
     } \
   void cls::setForeground(FXColor clr){ \
     FXRbCallVoidMethod(this,rb_intern("setForeground"),clr); \
diff --git a/ext/fox16/include/FXRuby.h b/ext/fox16/include/FXRuby.h
index dc1525c8c6ad34666ca78ddda4b245bbac3d3fcd..21f527d844732702dca30406b41f8cab540c0a7f 100644
--- a/ext/fox16/include/FXRuby.h
+++ b/ext/fox16/include/FXRuby.h
@@ -171,6 +171,11 @@ FXint FXRbSignalNameToNumber(const char* name);
 // Fox module instance
 extern VALUE mFox;
 
+#ifdef HAVE_RUBY_ENCODING_H
+// UTF-8 encoding index
+extern int utf8_enc_idx;
+#endif
+
 // Convert from FOX datatypes to Ruby objects
 inline VALUE to_ruby(const void* ptr){
   return Qnil; // FIXME: Used for some FXIconSource methods
@@ -223,11 +228,28 @@ inline VALUE to_ruby(unsigned long l){
 #endif
 
 inline VALUE to_ruby(const FXString& s){
-  return rb_str_new2(s.text());
+  VALUE str = rb_str_new(s.text(), s.length());
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate_index(str, utf8_enc_idx);
+#endif
+  return str;
   }
 
 inline VALUE to_ruby(const FXchar* s){
-  return s ? rb_str_new2(s) : Qnil;
+  if(!s) return Qnil;
+  VALUE str = rb_str_new2(s);
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate_index(str, utf8_enc_idx);
+#endif
+  return str;
+  }
+
+inline VALUE to_ruby(const FXchar* s, int length){
+  VALUE str = rb_str_new(s, length);
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate_index(str, utf8_enc_idx);
+#endif
+  return str;
   }
 
 extern VALUE to_ruby(const FXObject* obj);
diff --git a/swig-interfaces/FXApp.i b/swig-interfaces/FXApp.i
index 89f7d7994afb922ec6c6e0525c3bb1efbbc265eb..e215142cd0a1b1c3f652f60125dbcdcb99189da0 100644
--- a/swig-interfaces/FXApp.i
+++ b/swig-interfaces/FXApp.i
@@ -161,7 +161,7 @@ public:
   %extend {
     // Copyright notice for library
     static VALUE copyright() {
-      return rb_str_new2((const char *) FXApp::copyright);
+      return to_ruby(FXApp::copyright);
     }
   }
 
diff --git a/swig-interfaces/FXBMPIcon.i b/swig-interfaces/FXBMPIcon.i
index 27a6fcda4e32b952ccd13f3efc8f9b3c47bcd920..b785c999a9d2df68c4cf1f88910e16689e857ff6 100644
--- a/swig-interfaces/FXBMPIcon.i
+++ b/swig-interfaces/FXBMPIcon.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXBMPIcon::fileExt);
+      return to_ruby(FXBMPIcon::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXBMPIcon::mimeType);
+      return to_ruby(FXBMPIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXBMPImage.i b/swig-interfaces/FXBMPImage.i
index 2576e994db9d2993d3a0e75f7a6f42221f8ae9f6..26c2912c396940f66a295933a45282753684a476 100644
--- a/swig-interfaces/FXBMPImage.i
+++ b/swig-interfaces/FXBMPImage.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXBMPImage::fileExt);
+      return to_ruby(FXBMPImage::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXBMPImage::mimeType);
+      return to_ruby(FXBMPImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXCURCursor.i b/swig-interfaces/FXCURCursor.i
index dcb6a8b00f391494d52644edca21f17fbdd09ddb..fc8894b268c4432cf9144ccee564e9496635fc3f 100644
--- a/swig-interfaces/FXCURCursor.i
+++ b/swig-interfaces/FXCURCursor.i
@@ -28,7 +28,7 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXCURCursor::fileExt);
+      return to_ruby(FXCURCursor::fileExt);
       }
     }
 public:
diff --git a/swig-interfaces/FXFileDialog.i b/swig-interfaces/FXFileDialog.i
index 645274126233c5d9dd00208932e6fc5549cbcdb7..0c8d5ceaadc5afda376ff485d5ec3c19f70c34a9 100644
--- a/swig-interfaces/FXFileDialog.i
+++ b/swig-interfaces/FXFileDialog.i
@@ -70,10 +70,10 @@ public:
         if (filenames) {
             register FXString *p = filenames;
             while ((*p) != FXString::null) {
-                rb_ary_push(result, rb_str_new2((*p).text()));
-		p++;
+                rb_ary_push(result, to_ruby(*p));
+                p++;
             }
-	    delete [] filenames;
+            delete [] filenames;
         }
         return result;
     }
@@ -239,10 +239,10 @@ public:
         if (filenames) {
             register FXString *p = filenames;
             while ((*p) != FXString::null) {
-                rb_ary_push(result, rb_str_new2((*p).text()));
-		p++;
+                rb_ary_push(result, to_ruby(*p));
+                p++;
             }
-	    delete [] filenames;
+            delete [] filenames;
         }
         return result;
     }
diff --git a/swig-interfaces/FXFileSelector.i b/swig-interfaces/FXFileSelector.i
index 8b00a6b9693a9eef0e5665dbc49e23c36427b24e..89cbd4e721d4471297a61fe92b3720e646f68c98 100644
--- a/swig-interfaces/FXFileSelector.i
+++ b/swig-interfaces/FXFileSelector.i
@@ -167,10 +167,10 @@ public:
         if (filenames) {
             register FXString *p = filenames;
             while ((*p) != FXString::null) {
-                rb_ary_push(result, rb_str_new2((*p).text()));
-		p++;
+                rb_ary_push(result, to_ruby(*p));
+                p++;
             }
-	    delete [] filenames;
+            delete [] filenames;
         }
         return result;
     }
diff --git a/swig-interfaces/FXGIFCursor.i b/swig-interfaces/FXGIFCursor.i
index d8565f98ece3258a37b48a23e165d709c5e7ebe0..0dc64f447c55f7c8b5f1b6e238849cf34bb1512d 100644
--- a/swig-interfaces/FXGIFCursor.i
+++ b/swig-interfaces/FXGIFCursor.i
@@ -27,7 +27,7 @@ class FXGIFCursor : public FXCursor {
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXGIFCursor::fileExt);
+      return to_ruby(FXGIFCursor::fileExt);
       }
     }
 public:
diff --git a/swig-interfaces/FXGIFIcon.i b/swig-interfaces/FXGIFIcon.i
index 6fb5467fb5a1fdd1ab92f5017ba32ec4dca77547..2719adb261e80103917900e465a519c1ba2de953 100644
--- a/swig-interfaces/FXGIFIcon.i
+++ b/swig-interfaces/FXGIFIcon.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXGIFIcon::fileExt);
+      return to_ruby(FXGIFIcon::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXGIFIcon::mimeType);
+      return to_ruby(FXGIFIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXGIFImage.i b/swig-interfaces/FXGIFImage.i
index db0e0a831df128c818a95aa37121f9156f8b8115..965570601f8ce5a74a154707b899f8cb9da8b4ae 100644
--- a/swig-interfaces/FXGIFImage.i
+++ b/swig-interfaces/FXGIFImage.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXGIFImage::fileExt);
+      return to_ruby(FXGIFImage::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXGIFImage::mimeType);
+      return to_ruby(FXGIFImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXICOIcon.i b/swig-interfaces/FXICOIcon.i
index e274788699c8c5b07cb65d63e1651cbfd52b329b..a7e1a82b38bd369f4534f6913ef09ca676f0db13 100644
--- a/swig-interfaces/FXICOIcon.i
+++ b/swig-interfaces/FXICOIcon.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXICOIcon::fileExt);
+      return to_ruby(FXICOIcon::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXICOIcon::mimeType);
+      return to_ruby(FXICOIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXICOImage.i b/swig-interfaces/FXICOImage.i
index 9d30f623da101444b7d84844dd6c883d425ca608..89dbb6ccdd2de85a4ec1b4ce0e2f5d17ff51faab 100644
--- a/swig-interfaces/FXICOImage.i
+++ b/swig-interfaces/FXICOImage.i
@@ -28,10 +28,10 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXICOImage::fileExt);
+      return to_ruby(FXICOImage::fileExt);
       }
     static VALUE mimeType() {
-      return rb_str_new2(FXICOImage::mimeType);
+      return to_ruby(FXICOImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXJPGIcon.i b/swig-interfaces/FXJPGIcon.i
index 39844d25dd3289199105d41b962025fdf3dfdf76..4983c56c0d3fb3b0a6bb3b48f9554b6526651dd8 100644
--- a/swig-interfaces/FXJPGIcon.i
+++ b/swig-interfaces/FXJPGIcon.i
@@ -31,11 +31,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXJPGIcon::fileExt);
+      return to_ruby(FXJPGIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXJPGIcon::mimeType);
+      return to_ruby(FXJPGIcon::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXJPGImage.i b/swig-interfaces/FXJPGImage.i
index d577b566add43a2ea89794c6f5d4ad6b63d0705b..a054b796112bae8545d8d1f83c910b420e875406 100644
--- a/swig-interfaces/FXJPGImage.i
+++ b/swig-interfaces/FXJPGImage.i
@@ -31,11 +31,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXJPGImage::fileExt);
+      return to_ruby(FXJPGImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXJPGImage::mimeType);
+      return to_ruby(FXJPGImage::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXPCXIcon.i b/swig-interfaces/FXPCXIcon.i
index 3b0fc339d86ba4b0c2790988303264b057dec4f8..b4bd7aff340b2c56be86e080e90333f6f0b4fd98 100644
--- a/swig-interfaces/FXPCXIcon.i
+++ b/swig-interfaces/FXPCXIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPCXIcon::fileExt);
+      return to_ruby(FXPCXIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPCXIcon::mimeType);
+      return to_ruby(FXPCXIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXPCXImage.i b/swig-interfaces/FXPCXImage.i
index 16420779f9d705d0fa69c1f5a0a55793590fcc88..a3a31e1c5a2b893a89e744303cc99f314ac002f5 100644
--- a/swig-interfaces/FXPCXImage.i
+++ b/swig-interfaces/FXPCXImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPCXImage::fileExt);
+      return to_ruby(FXPCXImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPCXImage::mimeType);
+      return to_ruby(FXPCXImage::mimeType);
       }
   }
 public:
diff --git a/swig-interfaces/FXPNGIcon.i b/swig-interfaces/FXPNGIcon.i
index 605d4e707c504efc4642822797bab7865cc4ae31..4efb29f8dab7f8f1927f9e549332c9bd8219a08f 100644
--- a/swig-interfaces/FXPNGIcon.i
+++ b/swig-interfaces/FXPNGIcon.i
@@ -29,11 +29,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPNGIcon::fileExt);
+      return to_ruby(FXPNGIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPNGIcon::mimeType);
+      return to_ruby(FXPNGIcon::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXPNGImage.i b/swig-interfaces/FXPNGImage.i
index 3510353af80310db0ed8e9045f6af821a36571c8..e474071ce94011d6c3e39b5e9d83c0245bf503e9 100644
--- a/swig-interfaces/FXPNGImage.i
+++ b/swig-interfaces/FXPNGImage.i
@@ -29,11 +29,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPNGImage::fileExt);
+      return to_ruby(FXPNGImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPNGImage::mimeType);
+      return to_ruby(FXPNGImage::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXPPMIcon.i b/swig-interfaces/FXPPMIcon.i
index e73dc875373eee83ffc98040e51e247a34c96ea4..0f7c735230fa7d47a11f70ea2d6fef5481c3903e 100644
--- a/swig-interfaces/FXPPMIcon.i
+++ b/swig-interfaces/FXPPMIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPPMIcon::fileExt);
+      return to_ruby(FXPPMIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPPMIcon::mimeType);
+      return to_ruby(FXPPMIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXPPMImage.i b/swig-interfaces/FXPPMImage.i
index c75f7771d6650f5f9c41a4ce8d89eff3227b9eaa..6121492e041d07675ddb6e1f826c762bee2b49c7 100644
--- a/swig-interfaces/FXPPMImage.i
+++ b/swig-interfaces/FXPPMImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXPPMImage::fileExt);
+      return to_ruby(FXPPMImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXPPMImage::mimeType);
+      return to_ruby(FXPPMImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXRGBIcon.i b/swig-interfaces/FXRGBIcon.i
index 7447c9b941cc49c2e053581fea26cec5fc55c5b3..6a06374849c3c2700c699ffc2e472a604a41ef7d 100644
--- a/swig-interfaces/FXRGBIcon.i
+++ b/swig-interfaces/FXRGBIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXRGBIcon::fileExt);
+      return to_ruby(FXRGBIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXRGBIcon::mimeType);
+      return to_ruby(FXRGBIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXRGBImage.i b/swig-interfaces/FXRGBImage.i
index 4be93a93ea0914540e40fd0029e509616c6bd726..60f115ddc175390f23fd58bf98ad00f52fc559d3 100644
--- a/swig-interfaces/FXRGBImage.i
+++ b/swig-interfaces/FXRGBImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXRGBImage::fileExt);
+      return to_ruby(FXRGBImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXRGBImage::mimeType);
+      return to_ruby(FXRGBImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXScintilla.i b/swig-interfaces/FXScintilla.i
index a620b7f363f24052bb1a0d176b81b8123af6a62e..cb31972551072596e0eeedbb82f34fa7a68b590a 100644
--- a/swig-interfaces/FXScintilla.i
+++ b/swig-interfaces/FXScintilla.i
@@ -40,10 +40,10 @@ struct SCNotification {
     // Need to be careful about when this field's value is actually defined
     VALUE text() const {
       if (self->nmhdr.code==SCN_MODIFIED){
-        return (self->text) ? rb_str_new(self->text,self->length) : Qnil;
+        return (self->text) ? to_ruby(self->text,self->length) : Qnil;
         }
       else if (self->nmhdr.code==SCN_USERLISTSELECTION || self->nmhdr.code==SCN_URIDROPPED){
-        return (self->text) ? rb_str_new2(self->text) : Qnil;
+        return (self->text) ? to_ruby(self->text) : Qnil;
       } else {
         return Qnil;
       }
diff --git a/swig-interfaces/FXTGAIcon.i b/swig-interfaces/FXTGAIcon.i
index dc2e3166d5f3281fdedb3b264cefdf51320468f6..a05aabab2cbbc19b34dfea99c0cf3d8d2a3d5e21 100644
--- a/swig-interfaces/FXTGAIcon.i
+++ b/swig-interfaces/FXTGAIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXTGAIcon::fileExt);
+      return to_ruby(FXTGAIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXTGAIcon::mimeType);
+      return to_ruby(FXTGAIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXTGAImage.i b/swig-interfaces/FXTGAImage.i
index a3e649eee4d2a53c3c512b47809ba7b071ed8299..550315db27721184cb324d3aea63888f1bb11ef4 100644
--- a/swig-interfaces/FXTGAImage.i
+++ b/swig-interfaces/FXTGAImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXTGAImage::fileExt);
+      return to_ruby(FXTGAImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXTGAImage::mimeType);
+      return to_ruby(FXTGAImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXTIFIcon.i b/swig-interfaces/FXTIFIcon.i
index 8e9458bb84864cb2bfbae9ba2a44cf4c8f5e1c1b..cd9dcde58f2de3da3ba559b046b2815ff3556ce6 100644
--- a/swig-interfaces/FXTIFIcon.i
+++ b/swig-interfaces/FXTIFIcon.i
@@ -31,11 +31,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXTIFIcon::fileExt);
+      return to_ruby(FXTIFIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXTIFIcon::mimeType);
+      return to_ruby(FXTIFIcon::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXTIFImage.i b/swig-interfaces/FXTIFImage.i
index 78c6becb44aed21e03028dc6ed09c09edc93ea59..cb1265ba2ad1e805316bb4fe5476e934fa74f76f 100644
--- a/swig-interfaces/FXTIFImage.i
+++ b/swig-interfaces/FXTIFImage.i
@@ -31,11 +31,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXTIFImage::fileExt);
+      return to_ruby(FXTIFImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXTIFImage::mimeType);
+      return to_ruby(FXTIFImage::mimeType);
       }
 
     /// True if format is supported
diff --git a/swig-interfaces/FXTable.i b/swig-interfaces/FXTable.i
index d1f7f3005cfee06a57f4f0476a59228a6632e087..5b1da2879c6557261f8a474b981fe7d18277012b 100644
--- a/swig-interfaces/FXTable.i
+++ b/swig-interfaces/FXTable.i
@@ -656,7 +656,7 @@ public:
       VALUE result;
       if(startrow<0 || startcol<0 || self->getNumRows()<=endrow || self->getNumColumns()<=endcol) rb_raise(rb_eIndexError,"index out of bounds");
       self->extractText(str,startrow,endrow,startcol,endcol,cs,rs);
-      result=rb_str_new2(str.text());
+      result=to_ruby(str);
       return result;
       }
 
diff --git a/swig-interfaces/FXText.i b/swig-interfaces/FXText.i
index 5502d22cef6cee96a1161348d58d1113dc529f80..c8569fdf0801f4303939a6af6ae07e0651d0de8e 100644
--- a/swig-interfaces/FXText.i
+++ b/swig-interfaces/FXText.i
@@ -81,10 +81,10 @@ struct FXTextChange {
   FXint   nins;         /// Number characters inserted at position
   %extend {
     VALUE ins() const {
-      return rb_str_new(self->ins,self->nins);
+      return to_ruby(self->ins,self->nins);
       }
     VALUE del() const {
-      return rb_str_new(self->del,self->ndel);
+      return to_ruby(self->del,self->ndel);
       }
     }
   };
@@ -488,7 +488,7 @@ public:
       VALUE str;
       FXString buffer;
       self->extractText(buffer,pos,n);
-      str=rb_str_new(buffer.text(),n);
+      str=to_ruby(buffer.text(),n);
       return str;
       }
 
@@ -498,8 +498,8 @@ public:
       VALUE str=Qnil;
       if(self->isStyled()){
         self->extractStyle(style,pos,n);
-        str=rb_str_new(style.text(),n);
-	}
+        str=to_ruby(style.text(),n);
+        }
       return str;
       }
 
diff --git a/swig-interfaces/FXXBMIcon.i b/swig-interfaces/FXXBMIcon.i
index 99bd4f3b3b49a620a32b2871e0c0c8e25ced85fb..6ff7947dfc5a8c296693c1e285556e1dd86f0401 100644
--- a/swig-interfaces/FXXBMIcon.i
+++ b/swig-interfaces/FXXBMIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXXBMIcon::fileExt);
+      return to_ruby(FXXBMIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXXBMIcon::mimeType);
+      return to_ruby(FXXBMIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXXBMImage.i b/swig-interfaces/FXXBMImage.i
index a1643f85b02375efa25159cfb531d2d920a3dab3..bf85f030f4ca6e4fce92b646c2c6778ac8e4eea9 100644
--- a/swig-interfaces/FXXBMImage.i
+++ b/swig-interfaces/FXXBMImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXXBMImage::fileExt);
+      return to_ruby(FXXBMImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXXBMImage::mimeType);
+      return to_ruby(FXXBMImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXXPMIcon.i b/swig-interfaces/FXXPMIcon.i
index abed78b638d59fcc2a546e77581522ead134a217..f22b124dc9f38e7d0ea865e0a81f1425857ab87d 100644
--- a/swig-interfaces/FXXPMIcon.i
+++ b/swig-interfaces/FXXPMIcon.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXXPMIcon::fileExt);
+      return to_ruby(FXXPMIcon::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXXPMIcon::mimeType);
+      return to_ruby(FXXPMIcon::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/FXXPMImage.i b/swig-interfaces/FXXPMImage.i
index f31cebe7926697bb6dc8f8aec7a114dc7e9f4d37..c333197b2e382608e33b2d38ab4f3cfc3e53f5da 100644
--- a/swig-interfaces/FXXPMImage.i
+++ b/swig-interfaces/FXXPMImage.i
@@ -28,11 +28,11 @@ protected:
 public:
   %extend {
     static VALUE fileExt() {
-      return rb_str_new2(FXXPMImage::fileExt);
+      return to_ruby(FXXPMImage::fileExt);
       }
 
     static VALUE mimeType() {
-      return rb_str_new2(FXXPMImage::mimeType);
+      return to_ruby(FXXPMImage::mimeType);
       }
     }
 public:
diff --git a/swig-interfaces/fxdefs.i b/swig-interfaces/fxdefs.i
index 6e10961195150b4841e5bdfe6873e4161e270f05..3b1e496c6dd5c6c7c7b1d18eb003bb8e9c251deb 100644
--- a/swig-interfaces/fxdefs.i
+++ b/swig-interfaces/fxdefs.i
@@ -408,7 +408,7 @@ FXbool fxisconsole(const FXchar *path);
 /// Version number that the library has been compiled with
 VALUE _fxversion(){
   FXString version=FXStringFormat("%d.%d.%d",fxversion[0],fxversion[1],fxversion[2]);
-  return rb_str_new2(version.text());
+  return to_ruby(version);
   }
 %}
 
diff --git a/swig-interfaces/ruby-typemaps.i b/swig-interfaces/ruby-typemaps.i
index 109aee5803603ae1e0b8135f796566a4f26f3982..79015a0bb1ca70fec51abe3e3e402aa8e1845b1c 100644
--- a/swig-interfaces/ruby-typemaps.i
+++ b/swig-interfaces/ruby-typemaps.i
@@ -106,13 +106,13 @@ inline FXbool to_FXbool(VALUE obj){
 %typemap(out) FXbool "$result = $1 ? Qtrue : Qfalse;";
 
 /* Convert FXString struct members to Ruby strings */
-%typemap(out) FXString * "$result = rb_str_new2($1->text());";
+%typemap(out) FXString * "$result = to_ruby($1->text());";
 
 /* Convert FXString return values to Ruby strings */
-%typemap(out) FXString "$result = rb_str_new2($1.text());";
+%typemap(out) FXString "$result = to_ruby($1.text());";
 
 /* Convert const FXString& return values to Ruby strings */
-%typemap(out) const FXString& "$result = rb_str_new2($1->text());";
+%typemap(out) const FXString& "$result = to_ruby($1->text());";
 
 /**
  * Used by constructors for icons and images that require an array
diff --git a/test/TC_FXComboBox.rb b/test/TC_FXComboBox.rb
index ee83c9c237d90dc82b84d6c39e3337e287e2674d..715e1990d4b1b583a396fcbbfc8d6d71c179e83a 100755
--- a/test/TC_FXComboBox.rb
+++ b/test/TC_FXComboBox.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'test/unit'
 require 'testcase'
 require 'fox16'
@@ -59,5 +60,13 @@ class TC_FXComboBox < Fox::TestCase
     assert_equal("two", items[1])
     assert_equal("three", items[2])
   end
+
+  if ''.respond_to?(:encoding)
+    def test_encoding
+      assert_equal(3, @comboBox.fillItems(%w{"世界 線航跡 蔵"}))
+      assert_equal(Encoding::UTF_8, @comboBox.getItem(2).encoding)
+      assert_equal('線航跡', @comboBox.getItem(1))
+    end
+  end
 end
 
diff --git a/test/TC_FXList.rb b/test/TC_FXList.rb
index 594e94f1f411685192fc9f8a9c8c47f86c5bd8cf..3a507abe08544d6969cdefc2af02027597947eec 100755
--- a/test/TC_FXList.rb
+++ b/test/TC_FXList.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'test/unit'
 require 'testcase'
 require 'fox16'
@@ -113,4 +114,12 @@ class TC_FXList < Fox::TestCase
       @list.makeItemVisible(3)
     }
   end
+
+  if ''.respond_to?(:encoding)
+    def test_encoding
+      @list.appendItem("世界線航跡蔵")
+      assert_equal(Encoding::UTF_8, @list.getItem(0).text.encoding)
+      assert_equal('世界線航跡蔵', @list.getItem(0).text)
+    end
+  end
 end
diff --git a/test/TC_FXText.rb b/test/TC_FXText.rb
index 894edb219d7a947f1d103fbcd45e6b56dda513e0..93638b7a24d78f01ea0074fdb94a3ead4d0a82c7 100755
--- a/test/TC_FXText.rb
+++ b/test/TC_FXText.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'test/unit'
 require 'fox16'
 require 'fox16/colors'
@@ -93,4 +94,12 @@ public
     assert_equal([8, 6, 8], endIndex)
   end
 
+  if ''.respond_to?(:encoding)
+    def test_encoding
+      @text.text = "世界線航跡蔵"
+      assert_equal(Encoding::UTF_8, @text.text.encoding)
+      assert_equal('世界線航跡蔵', @text.text)
+      assert_equal('線航', @text.extractText(@text.text[0,2].bytesize, @text.text[2,2].bytesize))
+    end
+  end
 end