Merge "Add more Preedit enumerations for custom styles" into devel/master

diff --combined dali/internal/input/windows/input-method-context-impl-win.cpp
index ea75acb,dad833c..1061aec
--- 1/dali/internal/input/windows/input-method-context-impl-win.cpp
--- 2/dali/internal/input/windows/input-method-context-impl-win.cpp
+++ b/dali/internal/input/windows/input-method-context-impl-win.cpp
@@@ -41,13 -41,6 +41,13 @@@ namespace Interna
  namespace Adaptor\r
  {\r
  \r
 +namespace\r
 +{\r
 +#if defined(DEBUG_ENABLED)\r
 +Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_INPUT_METHOD_CONTEXT" );\r
 +#endif\r
 +}\r
 +\r
  InputMethodContextPtr InputMethodContextWin::New( Dali::Actor actor )\r
  {\r
    InputMethodContextPtr manager;\r
@@@ -69,8 -62,7 +69,7 @@@ InputMethodContextWin::InputMethodConte
    mIMFCursorPosition( 0 ),\r
    mSurroundingText(),\r
    mRestoreAfterFocusLost( false ),\r
-   mIdleCallbackConnected( false ),\r
-   mPreeditType( Dali::InputMethodContext::PreeditStyle::NONE )\r
+   mIdleCallbackConnected( false )\r
  {\r
  \r
    actor.OnStageSignal().Connect( this, &InputMethodContextWin::OnStaged );\r
@@@ -372,10 -364,10 +371,10 @@@ void InputMethodContextWin::SetInputPan
    DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::SetInputPanelPosition\n" );\r
  }\r
  \r
- Dali::InputMethodContext::PreeditStyle InputMethodContextWin::GetPreeditStyle() const\r
+ void InputMethodContextWin::GetPreeditStyle( Vector< Dali::InputMethodContext::PreeditAttributeData >& attrs ) const\r
  {\r
    DALI_LOG_INFO( gLogFilter, Debug::General, "InputMethodContextWin::GetPreeditStyle\n" );\r
-   return mPreeditType;\r
+   attrs = mPreeditAttrs;\r
  }\r
  \r
  bool InputMethodContextWin::ProcessEventKeyDown( const KeyEvent& keyEvent )\r