projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[4.0] Ubuntu Build Error fix"
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
x11
/
imf-manager-impl-x.cpp
diff --git
a/adaptors/x11/imf-manager-impl-x.cpp
b/adaptors/x11/imf-manager-impl-x.cpp
index
c51bcff
..
1d9294f
100755
(executable)
--- a/
adaptors/x11/imf-manager-impl-x.cpp
+++ b/
adaptors/x11/imf-manager-impl-x.cpp
@@
-173,7
+173,7
@@
Dali::ImfManager ImfManager::Get()
// The Ecore_X_Window needs to use the ImfManager.
// Only when the render surface is window, we can get the Ecore_X_Window.
// The Ecore_X_Window needs to use the ImfManager.
// Only when the render surface is window, we can get the Ecore_X_Window.
- Ecore_X_Window
ecoreXwin( AnyCast< Ecore_X_Window
>( nativeWindow ) );
+ Ecore_X_Window
*ecoreXwin( AnyCast< Ecore_X_Window*
>( nativeWindow ) );
if ( ecoreXwin )
{
// If we fail to get Ecore_X_Window, we can't use the ImfManager correctly.
if ( ecoreXwin )
{
// If we fail to get Ecore_X_Window, we can't use the ImfManager correctly.
@@
-190,20
+190,20
@@
Dali::ImfManager ImfManager::Get()
}
}
}
}
- if ( ( imfManager != NULL )
&&
!imfManager->mInited )
+ if ( ( imfManager != NULL ) !imfManager->mInited )
{
ecore_imf_init();
imfManager->CreateContext( imfManager->mEcoreXWin );
imfManager->ConnectCallbacks();
{
ecore_imf_init();
imfManager->CreateContext( imfManager->mEcoreXWin );
imfManager->ConnectCallbacks();
- VirtualKeyboard::ConnectCallbacks(
imfManager->
mIMFContext );
+ VirtualKeyboard::ConnectCallbacks( mIMFContext );
imfManager->mInited = true;
}
return manager;
}
imfManager->mInited = true;
}
return manager;
}
-ImfManager::ImfManager(
Ecore_X_Window
ecoreXwin )
+ImfManager::ImfManager(
Ecore_X_Window*
ecoreXwin )
: mIMFContext(),
mEcoreXWin( ecoreXwin ),
mIMFCursorPosition( 0 ),
: mIMFContext(),
mEcoreXWin( ecoreXwin ),
mIMFCursorPosition( 0 ),
@@
-219,7
+219,7
@@
ImfManager::~ImfManager()
Finalize();
}
Finalize();
}
-void ImfManager::CreateContext( Ecore_X_Window ecoreXwin )
+void ImfManager::CreateContext( Ecore_X_Window
*
ecoreXwin )
{
DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::CreateContext\n" );
{
DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::CreateContext\n" );