[Gnash-commit] /srv/bzr/gnash/trunk r10924: Use flash/ui/Mouse_as.cpp instead of asobj/Mouse_as.cpp.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10924
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-05-26 16:42:44 +0200
message:
  Use flash/ui/Mouse_as.cpp instead of asobj/Mouse_as.cpp.
  
  Use correct #include directive when writing uiclasses.h
modified:
  libcore/asobj/ClassHierarchy.cpp
  libcore/asobj/Global.cpp
  libcore/asobj/Makefile.am
  libcore/asobj/flash/ui/Mouse_as.cpp
  libcore/asobj/flash/ui/Mouse_as.h
  libcore/asobj/flash/ui/ui.am

=== modified file 'libcore/asobj/ClassHierarchy.cpp'
--- a/libcore/asobj/ClassHierarchy.cpp  2009-05-24 22:25:59 +0000
+++ b/libcore/asobj/ClassHierarchy.cpp  2009-05-26 14:42:44 +0000
@@ -40,7 +40,7 @@
 #include "Number_as.h"
 #include "Object.h"
 #include "Math_as.h"
-#include "Mouse_as.h"
+#include "flash/ui/Mouse_as.h"
 #include "MovieClipLoader.h"
 #include "movie_definition.h"
 #include "NetConnection_as.h"
@@ -306,7 +306,8 @@
        { XML_as::init, NSV::CLASS_XML, NSV::CLASS_OBJECT, NS_GLOBAL, 5 },
        { XMLNode_as::init, NSV::CLASS_XMLNODE, NSV::CLASS_OBJECT,
         NSV::NS_FLASH_XML, 5 },
-       { Mouse_as::init, NSV::CLASS_MOUSE, NSV::CLASS_OBJECT, 
NSV::NS_FLASH_UI, 5 },
+       { mouse_class_init, NSV::CLASS_MOUSE, NSV::CLASS_OBJECT, 
NSV::NS_FLASH_UI,
+        5 },
        { number_class_init, NSV::CLASS_NUMBER, NSV::CLASS_OBJECT, NS_GLOBAL, 5 
},
        { TextFormat_as::init, NSV::CLASS_TEXT_FORMAT, NSV::CLASS_OBJECT,
         NS_GLOBAL, 5 },

=== modified file 'libcore/asobj/Global.cpp'
--- a/libcore/asobj/Global.cpp  2009-05-14 15:02:29 +0000
+++ b/libcore/asobj/Global.cpp  2009-05-26 14:42:44 +0000
@@ -45,7 +45,7 @@
 #include "Math_as.h"
 #include "XML_as.h"
 #include "XMLSocket_as.h"
-#include "Mouse_as.h"
+#include "flash/ui/Mouse_as.h"
 #include "MovieClipLoader.h"
 #include "movie_definition.h"
 #include "NetConnection_as.h"

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2009-05-26 07:32:04 +0000
+++ b/libcore/asobj/Makefile.am 2009-05-26 14:42:44 +0000
@@ -70,7 +70,6 @@
        LocalConnection_as.cpp\
        Math_as.cpp \
        Microphone.cpp  \
-       Mouse_as.cpp \
        NetConnection_as.cpp \
        NetStream_as.cpp \
        Number_as.cpp \
@@ -108,7 +107,6 @@
        LoadVars_as.h \
        LocalConnection_as.h\
        Microphone.h \
-       Mouse_as.h      \
        MovieClipLoader.h \
        NetConnection_as.h      \
        NetStream_as.h \

=== modified file 'libcore/asobj/flash/ui/Mouse_as.cpp'
--- a/libcore/asobj/flash/ui/Mouse_as.cpp       2009-05-25 18:28:53 +0000
+++ b/libcore/asobj/flash/ui/Mouse_as.cpp       2009-05-26 14:42:44 +0000
@@ -53,7 +53,7 @@
 
 // extern (used by Global.cpp)
 void
-Mouse_as::init(as_object& global)
+mouse_class_init(as_object& global)
 {
     // This is going to be the global Mouse "class"/"function"
     boost::intrusive_ptr<as_object> obj = new as_object(getObjectInterface());

=== modified file 'libcore/asobj/flash/ui/Mouse_as.h'
--- a/libcore/asobj/flash/ui/Mouse_as.h 2009-05-25 18:28:53 +0000
+++ b/libcore/asobj/flash/ui/Mouse_as.h 2009-05-26 14:42:44 +0000
@@ -28,12 +28,12 @@
 public:
     /// Register native functions with the VM
     static void registerNative(as_object& global);
-
-    /// Initialize the global Mouse class
-    static void init(as_object& global);
 };
 
-} // end of gnash namespace
+void mouse_class_init(as_object& where);
+
+} // gnash namespace
+
 
 #endif
 

=== modified file 'libcore/asobj/flash/ui/ui.am'
--- a/libcore/asobj/flash/ui/ui.am      2009-05-26 01:53:14 +0000
+++ b/libcore/asobj/flash/ui/ui.am      2009-05-26 14:42:44 +0000
@@ -47,7 +47,7 @@
 endif
 
 if BUILD_MOUSE_AS3
-# UI_SOURCES += flash/ui/Mouse_as.cpp
+UI_SOURCES += flash/ui/Mouse_as.cpp
 UI_HEADERS += flash/ui/Mouse_as.h
 endif
 
@@ -64,7 +64,7 @@
        echo "// Generated by Makefile, don't hand edit!" > $${header}; \
        echo "#ifndef GNASH_ASOBJ3_UI_H" >> $${header}; \
        echo "#define GNASH_ASOBJ3_UI_H 1" >> $${header}; \
-       echo "#include <sharedlib.h>" >> $${header}; \
+       echo "#include \"sharedlib.h\"" >> $${header}; \
        echo "static gnash::SharedLib::initentry *asclasses[] = {" >> 
$${header}; \
        # drop the first node, which is always the top level package ;\
        sources="`echo $(UI_SOURCES) | cut -d ' ' -f 2-`"; \