X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Finput%2Fwindows%2Finput-method-context-impl-win.cpp;h=7c09270d4cd26996595928dc5d5120717296a88f;hb=14caebe2b88d7e2c97749c7389deac9ac560b8a6;hp=c09823f3a56d67331104e7f8395317ea68fa5b5a;hpb=584f9ba73d109953f7eacef881aa46644d43ce23;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/input/windows/input-method-context-impl-win.cpp b/dali/internal/input/windows/input-method-context-impl-win.cpp index c09823f..7c09270 100755 --- a/dali/internal/input/windows/input-method-context-impl-win.cpp +++ b/dali/internal/input/windows/input-method-context-impl-win.cpp @@ -135,16 +135,16 @@ InputMethodContextPtr InputMethodContextWin::New() Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) ); Any nativeWindow = adaptorImpl.GetNativeWindowHandle(); - // The Ecore_X_Window needs to use the InputMethodContext. - // Only when the render surface is window, we can get the Ecore_X_Window. - Ecore_X_Window ecoreXwin( AnyCast(nativeWindow) ); - if (ecoreXwin) + // The Win_Window_Handle needs to use the InputMethodContext. + // Only when the render surface is window, we can get the Win_Window_Handle. + Win_Window_Handle winWindow( AnyCast(nativeWindow) ); + if ( winWindow ) { - // If we fail to get Ecore_X_Window, we can't use the InputMethodContext correctly. + // If we fail to get Win_Window_Handle, we can't use the InputMethodContext correctly. // Thus you have to call "ecore_imf_context_client_window_set" somewhere. // In EvasPlugIn, this function is called in EvasPlugin::ConnectEcoreEvent(). - manager = new InputMethodContextWin( ecoreXwin ); + manager = new InputMethodContextWin( winWindow ); } else { @@ -163,9 +163,8 @@ void InputMethodContextWin::Finalize() //DeleteContext(); } -InputMethodContextWin::InputMethodContextWin( Ecore_X_Window ecoreXwin ) -//: mIMFContext(), -: mEcoreXwin( ecoreXwin ), +InputMethodContextWin::InputMethodContextWin( Win_Window_Handle winWindow ) +: mWin32Window( winWindow ), mIMFCursorPosition( 0 ), mSurroundingText(), mRestoreAfterFocusLost( false ), @@ -182,12 +181,12 @@ InputMethodContextWin::~InputMethodContextWin() void InputMethodContextWin::Initialize() { - CreateContext( mEcoreXwin ); + CreateContext( mWin32Window ); ConnectCallbacks(); //VirtualKeyboard::ConnectCallbacks( mIMFContext ); } -void InputMethodContextWin::CreateContext( Ecore_X_Window ecoreXwin ) +void InputMethodContextWin::CreateContext( Win_Window_Handle ecoreXwin ) { DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::CreateContext\n" );