[Gnash-commit] gnash/server button.cpp

[Vitaly Alexeev]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Vitaly Alexeev <alexeev>        06/07/01 13:20:44

Modified files:
        server         : button.cpp 

Log message:
        fixed bug #16969

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: button.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- button.cpp  28 Jun 2006 23:27:44 -0000      1.16
+++ button.cpp  1 Jul 2006 13:20:43 -0000       1.17
@@ -321,8 +321,9 @@
                        const matrix&   mat = 
m_def->m_button_records[r].m_button_matrix;
                        const cxform&   cx = 
m_def->m_button_records[r].m_button_cxform;
 
-                       //smart_ptr<character> ch = 
bdef->m_character_def->create_character_instance(this, id);
-                       smart_ptr<character> ch = 
bdef->m_character_def->create_character_instance(parent, id);
+                       // Vitaly: hack, FIXME
+                       smart_ptr<character> ch = 
bdef->m_character_def->create_character_instance((sprite_instance*)this, id);
+                       //smart_ptr<character> ch = 
bdef->m_character_def->create_character_instance(parent /*must be this*/, id);
                        m_record_character[r] = ch;
                        ch->set_matrix(mat);
                        ch->set_cxform(cx);
@@ -395,6 +396,8 @@
                            || (m_mouse_state == DOWN && rec.m_down)
                            || (m_mouse_state == OVER && rec.m_over))
                        {
+                                       matrix  mat = get_world_matrix();
+
                                m_record_character[i]->display();
                        }
                }