[Gnash-commit] /srv/bzr/gnash/trunk r11339: Fix enumeration error, allowing StaticText class to be registered and

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11339
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2009-07-30 09:13:17 +0200
message:
  Fix enumeration error, allowing StaticText class to be registered and
  silencing that annoying error message on each run.
modified:
  libcore/asobj/flash/text/StaticText_as.cpp
  libcore/namedStrings.h
    ------------------------------------------------------------
    revno: 11327.1.6
    committer: Benjamin Wolsey <address@hidden>
    branch nick: temp
    timestamp: Thu 2009-07-30 08:35:33 +0200
    message:
      Move CLASS_STATICTEXT in namedStrings enum so that it doesn't end up with 
the
      same index as a different class.
    modified:
      libcore/asobj/flash/text/StaticText_as.cpp
      libcore/namedStrings.h

=== modified file 'libcore/asobj/flash/text/StaticText_as.cpp'
--- a/libcore/asobj/flash/text/StaticText_as.cpp        2009-07-29 05:40:20 
+0000
+++ b/libcore/asobj/flash/text/StaticText_as.cpp        2009-07-30 06:35:33 
+0000
@@ -52,7 +52,8 @@
 };
 
 // extern (used by Global.cpp)
-void statictext_class_init(as_object& where, const ObjectURI& uri)
+void
+statictext_class_init(as_object& where, const ObjectURI& uri)
 {
     static boost::intrusive_ptr<as_object> cl;
 

=== modified file 'libcore/namedStrings.h'
--- a/libcore/namedStrings.h    2009-07-16 09:44:26 +0000
+++ b/libcore/namedStrings.h    2009-07-30 06:35:33 +0000
@@ -93,8 +93,8 @@
         CLASS_SOUND,
         CLASS_SPRITE,
         CLASS_STAGE,
+        PROP_iSTAGE = CLASS_STAGE,
         CLASS_STATICTEXT,
-        PROP_iSTAGE = CLASS_STAGE,
         CLASS_STRING,
         CLASS_STYLESHEET,
         CLASS_SYSTEM,