[Gnash-commit] gnash ChangeLog gui/gtk.cpp server/asobj/string...

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/04/12 07:09:06

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp 
        server/asobj   : string.cpp 

Log message:
        from_char_code: create a wide string in case the user tries to create 
one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2858&r2=1.2859
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2858
retrieving revision 1.2859
diff -u -b -r1.2858 -r1.2859
--- ChangeLog   12 Apr 2007 07:04:15 -0000      1.2858
+++ ChangeLog   12 Apr 2007 07:09:05 -0000      1.2859
@@ -1,3 +1,8 @@
+2007-04-11 Bastiaan Jacques
+
+       * server/asobj/string.cpp: from_char_code: create a wide string
+       in case the user tries to create one.
+
 2007-04-11 Markus Gothe <address@hidden>
 
        * server/sprite_instance.cpp: uint32 -> uint32_t.
@@ -10,8 +15,8 @@
 2007-04-11 Antti Ajanki <address@hidden>
        
        *  gui/gtk.cpp gui/gtksup.h gui/gui.cpp gui/gui.h
-       *  gui/kde.cpp gui/kde_glue.h gui/kdesup.h
-       *  moves the handling of GUI shortcuts (Crtl+R for restarting the 
+       *  gui/kde.cpp gui/kde_glue.h gui/kdesup.h:
+       moves the handling of GUI shortcuts (Crtl+R for restarting the 
           movie, Ctrl+Q for quiting, etc.) form GtkGui to base class Gui. 
           This way all GUIs can inherit the same code instead of having 
           to duplicate it.
@@ -107,6 +112,7 @@
        * gui/fltk.cpp: Fix compilation by adding statics for GUI methods
        that became nonstatic. Also fix some warnings.
        * all over the place: Replace SDL integer type names by standard ones.
+       Thanks to Ann for writing a Perl script to do search-and-replace.
 
 2007-04-11 Sandro Santilli <address@hidden>
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- gui/gtk.cpp 12 Apr 2007 07:02:15 -0000      1.84
+++ gui/gtk.cpp 12 Apr 2007 07:09:06 -0000      1.85
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.84 2007/04/12 07:02:15 nihilus Exp $ */
+/* $Id: gtk.cpp,v 1.85 2007/04/12 07:09:06 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1403,3 +1403,4 @@
 }
 
 } // end of namespace gnash
+

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/string.cpp     29 Mar 2007 08:44:05 -0000      1.25
+++ server/asobj/string.cpp     12 Apr 2007 07:09:06 -0000      1.26
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.25 2007/03/29 08:44:05 strk Exp $ */
+/* $Id: string.cpp,v 1.26 2007/04/12 07:09:06 bjacques Exp $ */
 
 // Implementation of ActionScript String class.
 
@@ -403,16 +403,16 @@
 static as_value
 string_from_char_code(const fn_call& fn)
 {
-    std::string result;
+    std::wstring result;
 
     // isn't this function supposed to take one argument?
 
     for (unsigned int i = 0; i < fn.nargs; i++) {
-        uint32_t c = fn.arg(i).to_number<uint32_t>();
+        wchar_t c = fn.arg(i).to_number<wchar_t>();
         result += c;
     }
 
-    return as_value(result);
+    return as_value(result.c_str());
 }
 
 static as_value