[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/30 13:41:51

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp edit_text_character.h 
        server/parser  : edit_text_character_def.h 

Log message:
                * server/edit_text_character.{h,cpp},
                  server/parser/edit_text_character_def.h:
                  use unsigned integers for curosr and max text length.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1828&r2=1.1829
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1828
retrieving revision 1.1829
diff -u -b -r1.1828 -r1.1829
--- ChangeLog   30 Nov 2006 13:32:45 -0000      1.1828
+++ ChangeLog   30 Nov 2006 13:41:51 -0000      1.1829
@@ -1,5 +1,8 @@
 2006-11-30 Sandro Santilli <address@hidden>
 
+       * server/edit_text_character.{h,cpp},
+         server/parser/edit_text_character_def.h:
+         use unsigned integers for curosr and max text length.
        * server/parser/movie_def_impl.{h,cpp}: implement
          a thread-safe get_bytes_loaded taking seek-backs
          into account.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/edit_text_character.cpp      29 Nov 2006 10:48:33 -0000      1.36
+++ server/edit_text_character.cpp      30 Nov 2006 13:41:51 -0000      1.37
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.36 2006/11/29 10:48:33 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.37 2006/11/30 13:41:51 strk Exp $ */
 
 #include "utf8.h"
 #include "log.h"
@@ -123,7 +123,7 @@
        m_def(def),
        _font(0),
        m_has_focus(false),
-       m_cursor(0),
+       m_cursor(0u),
        m_xcursor(0.0f),
        m_ycursor(0.0f),
        _text_variable_registered(false),
@@ -312,7 +312,7 @@
                                        break;
 
                                case key::DELETEKEY:
-                                       if (s.size() > (unsigned int)m_cursor)
+                                       if (s.size() > m_cursor)
                                        {
                                                s.erase(m_cursor, 1);
                                                set_text_value(s.c_str());
@@ -838,9 +838,9 @@
                        if (s_log_count < 10)
                        {
                                s_log_count++;
-                               log_warning("%s\n\t -- missing glyph for char 
%d\n"
-                                           "-- make sure character shapes for 
font %s are being exported "
-                                           "into your SWF file!\n",
+                               log_warning("%s -- missing glyph for char %d."
+                                           " Make sure character shapes for 
font %s are being exported "
+                                           "into your SWF file!",
                                            __PRETTY_FUNCTION__,
                                            code,
                                            _font->get_name()

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/edit_text_character.h        29 Nov 2006 10:48:33 -0000      1.19
+++ server/edit_text_character.h        30 Nov 2006 13:41:51 -0000      1.20
@@ -131,7 +131,7 @@
        const font* _font;
 
        bool m_has_focus;
-       int m_cursor;
+       size_t m_cursor;
        void show_cursor();
        float m_xcursor;
        float m_ycursor;

Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/edit_text_character_def.h     4 Nov 2006 13:40:18 -0000       
1.9
+++ server/parser/edit_text_character_def.h     30 Nov 2006 13:41:51 -0000      
1.10
@@ -114,10 +114,11 @@
                return m_variable_name;
        }
 
-       /// \brief
-       /// Return the maximum length of text this widget
-       /// can hold.
-       int get_max_length() const {
+       /// Return the maximum length of text this widget can hold.
+       //
+       /// If zero, the text length is unlimited.
+       ///
+       unsigned int get_max_length() const {
                return m_max_length;
        }
 
@@ -274,7 +275,10 @@
        rgba    m_color;
 
        /// Maximum length of text this widget can display (number of chars?)
-       int     m_max_length;
+       //
+       /// If zero, the text length is unlimited.
+       ///
+       unsigned int m_max_length;
 
        alignment m_alignment;