[Gnash-commit] gnash ChangeLog server/character.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/11 11:00:38

Modified files:
        .              : ChangeLog 
        server         : character.h 

Log message:
        * server/character.h: added comment to get_width() and get_height() 
virtual function (return in TWIPS). added a warning log when a subclass did not 
override these.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1136&r2=1.1137
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1136
retrieving revision 1.1137
diff -u -b -r1.1136 -r1.1137
--- ChangeLog   11 Oct 2006 10:40:19 -0000      1.1136
+++ ChangeLog   11 Oct 2006 11:00:37 -0000      1.1137
@@ -1,5 +1,8 @@
 2006-10-11 Sandro Santilli <address@hidden>
 
+       * server/character.h: added comment to get_width() and get_height()
+         virtual function (return in TWIPS). added a warning log when
+         a subclass did not override these.
        * macros/gtk2.m4: fix handling of --with-gtk2-libs (and commented-out
          the caching call due to ignorance about it :)
        * configure.ac: print GTK, PANGO and GLIB and ATK variables if gtk

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/character.h  10 Oct 2006 17:14:45 -0000      1.18
+++ server/character.h  11 Oct 2006 11:00:37 -0000      1.19
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: character.h,v 1.18 2006/10/10 17:14:45 strk Exp $ */
+/* $Id: character.h,v 1.19 2006/10/11 11:00:37 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -54,6 +54,7 @@
 
 #include <cstdarg>
 #include <cassert>
+#include <typeinfo>
 
 namespace gnash {
 
@@ -193,8 +194,20 @@
 
     // Movie interfaces.  By default do nothing.  sprite_instance and some 
others override these.
     virtual void       display() {}
-    virtual float      get_height() const { return 0; }
-    virtual float      get_width() const { return 0; }
+
+       /// Returns height of this character in TWIPS
+       virtual float   get_height() const
+       {
+               log_error("a character class didn't override get_height: %s", 
typeid(*this).name());
+               return 0;
+       }
+
+       /// Returns width of this character in TWIPS
+       virtual float   get_width() const
+       {
+               log_error("a character class didn't override get_width: %s", 
typeid(*this).name());
+               return 0;
+       }
 
     virtual sprite_instance* get_root_movie();