fxruby 1.6.25-x86-mingw32 → 1.6.26.pre1-x86-mingw32

data/ext/{fox16 → fox16_c}/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);

data/lib/fox16.rb

@@ -1,9 +1,9 @@
 if RUBY_PLATFORM =~ /(mswin|mingw)/i
-  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16.so"
+  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16_c.so"
 elsif RUBY_PLATFORM =~ /darwin/
-  require "fox16.bundle"
+  require "fox16_c.bundle"
 else
-  require "fox16.so"
+  require "fox16_c.so"
 end
 
 require "fox16/core"

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.25"
+    "1.6.26.pre1"
   end
 end

data/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);
     }
   }
 

data/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:

data/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: