diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
| commit | 809a280a51bc8645de7a02c2a3dbe32bc230b93c (patch) | |
| tree | 2a4d6dbe1fb8d78e77f5f7ce118a5f662788a453 /indra/llui/llfocusmgr.h | |
| parent | 1889d02569a58d08b6c452e609819a1961bf64e8 (diff) | |
| parent | 93051dc23cb3252af327a9b113abc45de154ff4e (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/llui/llfocusmgr.h')
| -rw-r--r-- | indra/llui/llfocusmgr.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llui/llfocusmgr.h b/indra/llui/llfocusmgr.h index 83ecd1d301..86d3ccf111 100644 --- a/indra/llui/llfocusmgr.h +++ b/indra/llui/llfocusmgr.h @@ -65,10 +65,10 @@ public: virtual BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); virtual BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); + virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere protected: virtual void onFocusReceived(); virtual void onFocusLost(); - virtual void onTopLost(); // called when registered as top ctrl and user clicks elsewhere focus_signal_t* mFocusLostCallback; focus_signal_t* mFocusReceivedCallback; focus_signal_t* mFocusChangedCallback; @@ -119,7 +119,7 @@ public: BOOL childIsTopCtrl( const LLView* parent ) const; // All Three - void releaseFocusIfNeeded( const LLView* top_view ); + void releaseFocusIfNeeded( LLView* top_view ); void lockFocus(); void unlockFocus(); BOOL focusLocked() const { return mLockedView != NULL; } @@ -149,12 +149,6 @@ private: typedef std::map<LLHandle<LLView>, LLHandle<LLView> > focus_history_map_t; focus_history_map_t mFocusHistory; - - #ifdef _DEBUG - std::string mMouseCaptorName; - std::string mKeyboardFocusName; - std::string mTopCtrlName; - #endif }; extern LLFocusMgr gFocusMgr; |