From 6415d2cc0b2854157ed8d87cca7dba448837f610 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 28 Oct 2009 19:18:34 +0000 Subject: [PATCH] add get_button_thrower() --- panda/src/framework/windowFramework.cxx | 13 ++++++++++++- panda/src/framework/windowFramework.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/panda/src/framework/windowFramework.cxx b/panda/src/framework/windowFramework.cxx index 0b5f608d23..7454cb6416 100644 --- a/panda/src/framework/windowFramework.cxx +++ b/panda/src/framework/windowFramework.cxx @@ -376,6 +376,17 @@ get_mouse() { return _mouse; } +//////////////////////////////////////////////////////////////////// +// Function: WindowFramework::get_button_thrower +// Access: Public +// Description: Returns the node in the data graph corresponding to +// the ButtonThrower object associated with this window. +//////////////////////////////////////////////////////////////////// +NodePath WindowFramework:: +get_button_thrower() { + return _button_thrower; +} + //////////////////////////////////////////////////////////////////// // Function: WindowFramework::enable_keyboard // Access: Public @@ -402,7 +413,7 @@ enable_keyboard() { mods.add_button(KeyboardButton::alt()); mods.add_button(KeyboardButton::meta()); bt->set_modifier_buttons(mods); - mouse.attach_new_node(bt); + _button_thrower = mouse.attach_new_node(bt); } _got_keyboard = true; diff --git a/panda/src/framework/windowFramework.h b/panda/src/framework/windowFramework.h index 4a156a08d8..602a8852cf 100644 --- a/panda/src/framework/windowFramework.h +++ b/panda/src/framework/windowFramework.h @@ -82,6 +82,7 @@ public: NodePath get_render_2d(); NodePath get_aspect_2d(); NodePath get_mouse(); + NodePath get_button_thrower(); void enable_keyboard(); void setup_trackball(); @@ -184,6 +185,7 @@ private: PT(GenericAsyncTask) _update_anim_controls_task; NodePath _mouse; + NodePath _button_thrower; PT(Trackball) _trackball; NodePath _alight;