[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/24 09:36:05

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

Log message:
        * server/movie_root.{h,cpp}: moved isMouseOverActiveEntity() from 
header to implementation file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1375&r2=1.1376
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1375
retrieving revision 1.1376
diff -u -b -r1.1375 -r1.1376
--- ChangeLog   24 Oct 2006 09:23:30 -0000      1.1375
+++ ChangeLog   24 Oct 2006 09:36:05 -0000      1.1376
@@ -1,5 +1,7 @@
 2006-10-24 Sandro Santilli <address@hidden>
 
+       * server/movie_root.{h,cpp}: moved isMouseOverActiveEntity() from
+         header to implementation file.
        * server/smart_ptr.h: made conversion from weak_ptr to smart_ptr
          a const method, added operator* for smart_ptr
        * server/parser/movie_def_impl.cpp (create_instance): minor cleanups.

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/movie_root.cpp       20 Oct 2006 14:30:15 -0000      1.19
+++ server/movie_root.cpp       24 Oct 2006 09:36:05 -0000      1.20
@@ -596,5 +596,19 @@
        m_active_input_text = ch;
 }
 
+bool
+movie_root::isMouseOverActiveEntity() const
+{
+       smart_ptr<movie> entity ( m_mouse_button_state.m_active_entity );
+       if ( ! entity.get_ptr() ) return false;
+
+#if 0 // debugging...
+       log_msg("The active entity under the pointer is a %s",
+               typeid(*entity).name());
+#endif
+
+       return true;
+}
+
 } // namespace gnash
 

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/movie_root.h 23 Oct 2006 16:02:30 -0000      1.20
+++ server/movie_root.h 24 Oct 2006 09:36:05 -0000      1.21
@@ -35,7 +35,7 @@
 // 
 //
 
-/* $Id: movie_root.h,v 1.20 2006/10/23 16:02:30 strk Exp $ */
+/* $Id: movie_root.h,v 1.21 2006/10/24 09:36:05 strk Exp $ */
 
 #ifndef GNASH_MOVIE_ROOT_H
 #define GNASH_MOVIE_ROOT_H
@@ -302,10 +302,7 @@
        }
 
        // reimplemented from movie_interface, see dox there
-       bool isMouseOverActiveEntity() const
-       {
-               return (m_mouse_button_state.m_active_entity != NULL);
-       }
+       bool isMouseOverActiveEntity() const;
 
 private: