livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CHUI-941 FIXED [CHUIBUG]Inline input is not available in 3.5.0

master
maksymsproductengine 2013-04-25 20:02:36 +03:00
parent e4207901d7
commit 1c5659b1ca
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llui/llchatentry.cpp
View File

@ -163,16 +163,6 @@ bool LLChatEntry::useLabel()
return !getLength() && !mLabel.empty();
}
void LLChatEntry::onFocusReceived()
{
}
void LLChatEntry::onFocusLost()
{
}
BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
{
BOOL handled = FALSE;

2
indra/llui/llchatentry.h
View File

@ -62,8 +62,6 @@ public:
virtual void draw();
virtual void onCommit();
/*virtual*/ void onFocusReceived();
/*virtual*/ void onFocusLost();
void enableSingleLineMode(bool single_line_mode);
boost::signals2::connection setTextExpandedCallback(const commit_signal_t::slot_type& cb);

3
indra/llwindow/llwindowwin32.cpp
View File

@ -159,9 +159,8 @@ LLWinImm LLWinImm::sTheInstance;
LLWinImm::LLWinImm() : mHImmDll(NULL)
{
// Check system metrics
if ( !GetSystemMetrics( SM_DBCSENABLED ) )
if ( !GetSystemMetrics( SM_IMMENABLED ) )
return;
mHImmDll = LoadLibraryA("Imm32");
if (mHImmDll != NULL)