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

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   06/11/04 13:40:19

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

Log message:
        don't catch mouse events when text field is not selectable

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1515&r2=1.1516
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.1515
retrieving revision 1.1516
diff -u -b -r1.1515 -r1.1516
--- ChangeLog   4 Nov 2006 12:34:55 -0000       1.1515
+++ ChangeLog   4 Nov 2006 13:40:18 -0000       1.1516
@@ -2,6 +2,10 @@
 
        * backend/render_handler_agg.cpp: removed compatibility include as
        it is not enough anyway; optimized screen and mask clearing
+       * server/parser/edit_text_character_def.h: added read method for
+       m_no-select
+       * server/edit_text_character.cpp: don't catch mouse events when
+       text feld is not selectable
 
 2006-11-04 Markus Gothe <address@hidden>
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/edit_text_character.cpp      3 Nov 2006 14:03:37 -0000       1.23
+++ server/edit_text_character.cpp      4 Nov 2006 13:40:18 -0000       1.24
@@ -3,7 +3,7 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-/* $Id: edit_text_character.cpp,v 1.23 2006/11/03 14:03:37 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.24 2006/11/04 13:40:18 udog Exp $ */
 
 #include "utf8.h"
 #include "log.h"
@@ -276,6 +276,12 @@
                return NULL;
        }
 
+       if (m_def->get_no_select())
+       {
+         // not selectable, so don't catch mouse events!
+         return NULL;
+  }
+
        matrix  m = get_matrix();
                
        point   p;

Index: server/parser/edit_text_character_def.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/parser/edit_text_character_def.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/edit_text_character_def.h     29 Oct 2006 18:34:15 -0000      
1.8
+++ server/parser/edit_text_character_def.h     4 Nov 2006 13:40:18 -0000       
1.9
@@ -197,6 +197,11 @@
                return m_readonly;
        }
        
+       bool get_no_select() const 
+       {
+         return m_no_select;
+  }
+       
        const rect&     get_bound() const {
          // I know it's stupid to have an alias that's nearly the same name but
     // get_bound() is required by the base class and get_bounds() was already