X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Finput%2Fwindows%2Finput-method-context-impl-win.h;h=253bc02a48b04ee3605e1e37d7d5c1dd4c8c06a0;hb=107347fd130dda8102d6eb23d0fa9fc72dcd886d;hp=a2f71f3e0542d63647b4bb9c6b31be680f2cb7be;hpb=6f87db7f10cf41060ba6417eb108897f8140eb2a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/input/windows/input-method-context-impl-win.h b/dali/internal/input/windows/input-method-context-impl-win.h
index a2f71f3..253bc02 100755
--- a/dali/internal/input/windows/input-method-context-impl-win.h
+++ b/dali/internal/input/windows/input-method-context-impl-win.h
@@ -37,21 +37,22 @@ namespace Internal
 namespace Adaptor
 {
 
-class InputMethodContextWin : public Dali::Internal::Adaptor::InputMethodContext
+class InputMethodContextWin : public Dali::Internal::Adaptor::InputMethodContext, public Dali::ConnectionTracker
 {
 public:
   /**
    * @brief Creates a new InputMethodContext handle
    *
+   * @param[in] actor The actor that uses the new InputMethodContext instance.
    * @return InputMethodContext pointer
    */
-  static InputMethodContextPtr New();
+  static InputMethodContextPtr New( Dali::Actor actor );
 
   /**
    * Constructor
    * @param[in] win32Window, The window is created by application.
    */
-  explicit InputMethodContextWin( WinWindowHandle win32Window );
+  explicit InputMethodContextWin( Dali::Actor actor );
 
 public:
 
@@ -110,12 +111,12 @@ public:
   /**
    * @copydoc Dali::InputMethodContext::PreEditChanged()
    */
-  void PreEditChanged( void* data, ImfContext* imfContext, void* event_info ) override;
+  void PreEditChanged( void* data, ImfContext* imfContext, void* eventInfo ) override;
 
   /**
    * @copydoc Dali::InputMethodContext::NotifyCursorPosition()
    */
-  void CommitReceived( void* data, ImfContext* imfContext, void* event_info ) override;
+  void CommitReceived( void* data, ImfContext* imfContext, void* eventInfo ) override;
 
   /**
    * @copydoc Dali::InputMethodContext::NotifyCursorPosition()
@@ -125,12 +126,18 @@ public:
   /**
    * @copydoc Dali::InputMethodContext::DeleteSurrounding()
    */
-  void DeleteSurrounding( void* data, ImfContext* imfContext, void* event_info ) override;
+  void DeleteSurrounding( void* data, ImfContext* imfContext, void* eventInfo ) override;
 
   /**
    * @copydoc Dali::InputMethodContext::SendPrivateCommand()
    */
-  void SendPrivateCommand( void* data, ImfContext* imfContext, void* event_info ) override
+  void SendPrivateCommand( void* data, ImfContext* imfContext, void* eventInfo ) override
+  {}
+
+  /**
+   * @copydoc Dali::InputMethodContext::SendCommitContent()
+   */
+  void SendCommitContent( void* data, ImfContext* imfContext, void* eventInfo ) override
   {}
 
   // Cursor related
@@ -225,10 +232,35 @@ public:
   std::string GetInputPanelLocale() override;
 
   /**
+   * @copydoc Dali::InputMethodContext::SetContentMIMETypes()
+   */
+  void SetContentMIMETypes( const std::string& mimeTypes ) override;
+
+  /**
    * @copydoc Dali::InputMethodContext::FilterEventKey()
    */
   bool FilterEventKey( const Dali::KeyEvent& keyEvent ) override;
 
+  /**
+   * @copydoc Dali::InputMethodContext::SetInputPanelLanguage()
+   */
+  void SetInputPanelLanguage( Dali::InputMethodContext::InputPanelLanguage language ) override;
+
+  /**
+   * @copydoc Dali::InputMethodContext::GetInputPanelLanguage()
+   */
+  Dali::InputMethodContext::InputPanelLanguage GetInputPanelLanguage() const override;
+
+  /**
+   * @copydoc Dali::InputMethodContext::SetInputPanelPosition()
+   */
+  void SetInputPanelPosition( unsigned int x, unsigned int y ) override;
+
+  /**
+   * @copydoc Dali::InputMethodContext::GetPreeditStyle()
+   */
+  void GetPreeditStyle( Dali::InputMethodContext::PreEditAttributeDataContainer& attrs ) const override;
+
 private:
   /**
    * Context created the first time and kept until deleted.
@@ -259,6 +291,11 @@ private:
    */
   bool ProcessEventKeyUp( const KeyEvent& keyEvent );
 
+  /**
+   * Called when the binded actor is added to a window.
+   */
+  void OnStaged( Dali::Actor actor );
+
 public:
 
   /**
@@ -282,6 +319,7 @@ private:
   bool mRestoreAfterFocusLost:1;             ///< Whether the keyboard needs to be restored (activated ) after focus regained.
   bool mIdleCallbackConnected:1;             ///< Whether the idle callback is already connected.
   InputMethodOptions        mOptions;
+  Dali::InputMethodContext::PreEditAttributeDataContainer mPreeditAttrs; ///< Stores preedit attribute data
 };
 
 } // namespace Adaptor