[Orxonox-commit 2797] r7500 - in code/trunk/data/gui: layouts scripts

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-29 14:52:47 +0200 (Wed, 29 Sep 2010)
New Revision: 7500

Modified:
   code/trunk/data/gui/layouts/ChatBox.layout
   code/trunk/data/gui/scripts/ChatBox.lua
Log:
Fixing same issue as in tutorial2 branch. Error only occurs (as far as I can tell) on tardis.
Could be an issue with different CEGUI versions.


Modified: code/trunk/data/gui/layouts/ChatBox.layout
===================================================================
--- code/trunk/data/gui/layouts/ChatBox.layout	2010-09-29 12:49:26 UTC (rev 7499)
+++ code/trunk/data/gui/layouts/ChatBox.layout	2010-09-29 12:52:47 UTC (rev 7500)
@@ -24,7 +24,6 @@
                 <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
                 <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
             </Window>
-            <Event Name="CloseClicked" Function="ChatBox.ChatBoxCloseButton_clicked"/>
         </Window>
     </Window>
 </GUILayout>

Modified: code/trunk/data/gui/scripts/ChatBox.lua
===================================================================
--- code/trunk/data/gui/scripts/ChatBox.lua	2010-09-29 12:49:26 UTC (rev 7499)
+++ code/trunk/data/gui/scripts/ChatBox.lua	2010-09-29 12:52:47 UTC (rev 7500)
@@ -2,6 +2,11 @@
 
 local P = createMenuSheet("ChatBox")
 
+function P.onLoad()
+    local window = winMgr:getWindow("orxonox/ChatBox")
+    orxonox.GUIManager:subscribeEventHelper(window, "CloseClicked", P.name .. ".ChatBoxCloseButton_clicked")
+end
+
 function P.ChatBoxCloseButton_clicked(e)
     orxonox.ChatInputHandler:getInstance():deactivate()
 end