diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-16 15:02:58 +0200 |
| commit | 3874823bd8a388979bad2d882d5d52bffb8d78da (patch) | |
| tree | cb9713a19e8b9670cda7a5ec16b93f1e92b39584 /indra/llui/llfocusmgr.h | |
| parent | 2fed8d5182813e2077522bb5bbb2cc565b5c283d (diff) | |
| parent | a872814de964ebcbf40e812f79319a13a54e2336 (diff) | |
Merge from viewer-2-0
--HG--
branch : product-engine
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; |