From c2fbd971a647b2df233b31d6a6fdbcfd7485332c Mon Sep 17 00:00:00 2001
From: Lars Kanis <lars@greiz-reinsdorf.de>
Date: Fri, 15 Feb 2013 22:10:09 +0100
Subject: [PATCH] Mark strings retrieved from fox as UTF-8 when running Ruby
1.9.
---
ext/fox16/FXRuby.cpp | 9 +++++++--
ext/fox16/include/FXRbCommon.h | 4 ++++
ext/fox16/include/FXRbDC.h | 8 ++++----
ext/fox16/include/FXRuby.h | 26 ++++++++++++++++++++++++--
swig-interfaces/FXApp.i | 2 +-
swig-interfaces/FXBMPIcon.i | 4 ++--
swig-interfaces/FXBMPImage.i | 4 ++--
swig-interfaces/FXCURCursor.i | 2 +-
swig-interfaces/FXFileDialog.i | 12 ++++++------
swig-interfaces/FXFileSelector.i | 6 +++---
swig-interfaces/FXGIFCursor.i | 2 +-
swig-interfaces/FXGIFIcon.i | 4 ++--
swig-interfaces/FXGIFImage.i | 4 ++--
swig-interfaces/FXICOIcon.i | 4 ++--
swig-interfaces/FXICOImage.i | 4 ++--
swig-interfaces/FXJPGIcon.i | 4 ++--
swig-interfaces/FXJPGImage.i | 4 ++--
swig-interfaces/FXPCXIcon.i | 4 ++--
swig-interfaces/FXPCXImage.i | 4 ++--
swig-interfaces/FXPNGIcon.i | 4 ++--
swig-interfaces/FXPNGImage.i | 4 ++--
swig-interfaces/FXPPMIcon.i | 4 ++--
swig-interfaces/FXPPMImage.i | 4 ++--
swig-interfaces/FXRGBIcon.i | 4 ++--
swig-interfaces/FXRGBImage.i | 4 ++--
swig-interfaces/FXScintilla.i | 4 ++--
swig-interfaces/FXTGAIcon.i | 4 ++--
swig-interfaces/FXTGAImage.i | 4 ++--
swig-interfaces/FXTIFIcon.i | 4 ++--
swig-interfaces/FXTIFImage.i | 4 ++--
swig-interfaces/FXTable.i | 2 +-
swig-interfaces/FXText.i | 10 +++++-----
swig-interfaces/FXXBMIcon.i | 4 ++--
swig-interfaces/FXXBMImage.i | 4 ++--
swig-interfaces/FXXPMIcon.i | 4 ++--
swig-interfaces/FXXPMImage.i | 4 ++--
swig-interfaces/fxdefs.i | 2 +-
swig-interfaces/ruby-typemaps.i | 6 +++---
test/TC_FXComboBox.rb | 9 +++++++++
test/TC_FXList.rb | 9 +++++++++
test/TC_FXText.rb | 9 +++++++++
41 files changed, 138 insertions(+), 80 deletions(-)
diff --git a/ext/fox16/FXRuby.cpp b/ext/fox16/FXRuby.cpp
index 318b0b6..3fde207 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 0d03f71..2e76475 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 813b4e3..35bf11a 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 dc1525c..21f527d 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 89f7d79..e215142 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 27a6fcd..b785c99 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 2576e99..26c2912 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 dcb6a8b..fc8894b 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 6452741..0c8d5ce 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 8b00a6b..89cbd4e 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 d8565f9..0dc64f4 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 6fb5467..2719adb 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 db0e0a8..9655706 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 e274788..a7e1a82 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 9d30f62..89dbb6c 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 39844d2..4983c56 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 d577b56..a054b79 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 3b0fc33..b4bd7af 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 1642077..a3a31e1 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 605d4e7..4efb29f 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 3510353..e474071 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 e73dc87..0f7c735 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 c75f777..6121492 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 7447c9b..6a06374 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 4be93a9..60f115d 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 a620b7f..cb31972 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 dc2e316..a05aaba 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 a3e649e..550315d 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 8e9458b..cd9dcde 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 78c6bec..cb1265b 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 d1f7f30..5b1da28 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 5502d22..c8569fd 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 99bd4f3..6ff7947 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 a1643f8..bf85f03 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 abed78b..f22b124 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 f31cebe..c333197 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 6e10961..3b1e496 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 109aee5..79015a0 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 ee83c9c..715e199 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 594e94f..3a507ab 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 894edb2..93638b7 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
--
GitLab