[Gnash-commit] gnash ChangeLog server/character.cpp server/cha...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/22 23:55:00

Modified files:
        .              : ChangeLog 
        server         : character.cpp character.h movie_root.h 
                         sprite_instance.cpp sprite_instance.h 

Log message:
        drop get_mouse_state proxy from character class.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6349&r2=1.6350
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.139&r2=1.140
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.509&r2=1.510
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.180&r2=1.181

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6349
retrieving revision 1.6350
diff -u -b -r1.6349 -r1.6350
--- ChangeLog   22 Apr 2008 20:45:12 -0000      1.6349
+++ ChangeLog   22 Apr 2008 23:54:58 -0000      1.6350
@@ -1,3 +1,8 @@
+2008-04-23 Sandro Santilli <address@hidden>
+
+       * server/character.{cpp,h}, server/movie_root.h,
+         server/sprite_instance.{cpp,h}: drop get_mouse_state proxy.
+
 2008-04-22 Sandro Santilli <address@hidden>
 
        * gui/gui.cpp (resize_view): immediate display on resize, fixes

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/character.cpp        21 Apr 2008 11:27:42 -0000      1.93
+++ server/character.cpp        22 Apr 2008 23:54:59 -0000      1.94
@@ -90,6 +90,7 @@
        return m;
 }
 
+#if 0
 void
 character::get_mouse_state(int& x, int& y, int& buttons)
 {
@@ -99,6 +100,7 @@
 #endif // GNASH_USE_GC
        get_parent()->get_mouse_state(x, y, buttons);
 }
+#endif
 
 as_object*
 character::get_path_element_character(string_table::key key)

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -b -r1.139 -r1.140
--- server/character.h  21 Apr 2008 11:27:42 -0000      1.139
+++ server/character.h  22 Apr 2008 23:54:59 -0000      1.140
@@ -867,7 +867,7 @@
   /// will delegate the call to it's associated movie_root, which
   /// does all the work.
   ///
-  virtual void get_mouse_state(int& x, int& y, int& buttons);
+  //virtual void get_mouse_state(int& x, int& y, int& buttons);
 
   /// These have been moved down from movie.h to remove that file
   /// from the inheritance chain. It is probably still a misdesign

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -b -r1.509 -r1.510
--- server/sprite_instance.cpp  22 Apr 2008 19:55:02 -0000      1.509
+++ server/sprite_instance.cpp  22 Apr 2008 23:55:00 -0000      1.510
@@ -3836,11 +3836,13 @@
   return NULL;
 }
 
+#if 0
 void
 sprite_instance::get_mouse_state(int& x, int& y, int& buttons)
 {
   _vm.getRoot().get_mouse_state(x, y, buttons);
 }
+#endif
 
 void
 sprite_instance::stop_drag()

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -b -r1.180 -r1.181
--- server/sprite_instance.h    22 Apr 2008 19:55:03 -0000      1.180
+++ server/sprite_instance.h    22 Apr 2008 23:55:00 -0000      1.181
@@ -200,7 +200,7 @@
        virtual float get_background_alpha() const;
 
        // delegates to movie_root 
-       virtual void get_mouse_state(int& x, int& y, int& buttons);
+       //virtual void get_mouse_state(int& x, int& y, int& buttons);
 
        // delegates to movie_root (possibly wrong)
        void    set_background_color(const rgba& color);