X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fwindow-system%2Fwindows%2Fwindow-base-win.h;h=f19fdfc411438f027bfe6dd12e125afaf6b411fa;hb=c3916fe1fb10465161a98b77d2bc92786f10e4eb;hp=381def37033289059b6bf7d7dd82b3f3f5cafdbb;hpb=b7ddcd884215ff8645505daffaa73d6cb65db8d6;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/window-system/windows/window-base-win.h b/dali/internal/window-system/windows/window-base-win.h
index 381def3..f19fdfc 100755
--- a/dali/internal/window-system/windows/window-base-win.h
+++ b/dali/internal/window-system/windows/window-base-win.h
@@ -54,11 +54,6 @@ public:
 public:
 
   /**
-   * @brief Called when the window property is changed.
-   */
-  bool OnWindowPropertyChanged( void* data, int type, TWinEventInfo *event );
-
-  /**
    * Called when the window receives a delete request
    */
   void OnDeleteRequest();
@@ -66,57 +61,48 @@ public:
   /**
    * @brief Called when the window gains focus.
    */
-  void OnFocusIn( void* data, int type, TWinEventInfo *event );
+  void OnFocusIn( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when the window loses focus.
    */
-  void OnFocusOut( void* data, int type, TWinEventInfo *event );
+  void OnFocusOut( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when the window is damaged.
    */
-  void OnWindowDamaged( void* data, int type, TWinEventInfo *event );
+  void OnWindowDamaged( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a touch down is received.
    */
-  void OnMouseButtonDown( void* data, int type, TWinEventInfo *event );
+  void OnMouseButtonDown( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a touch up is received.
    */
-  void OnMouseButtonUp( void* data, int type, TWinEventInfo *event );
+  void OnMouseButtonUp( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a touch motion is received.
    */
-  void OnMouseButtonMove( void* data, int type, TWinEventInfo *event );
+  void OnMouseButtonMove( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a mouse wheel is received.
    */
-  void OnMouseWheel( void* data, int type, TWinEventInfo *event );
+  void OnMouseWheel( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a key down is received.
    */
-  void OnKeyDown( void* data, int type, TWinEventInfo *event );
+  void OnKeyDown( int type, TWinEventInfo *event );
 
   /**
    * @brief Called when a key up is received.
    */
-  void OnKeyUp( void* data, int type, TWinEventInfo *event );
+  void OnKeyUp( int type, TWinEventInfo *event );
 
-  /**
-   * @brief Called when the source window notifies us the content in clipboard is selected.
-   */
-  void OnSelectionClear( void* data, int type, TWinEventInfo *event );
-
-  /**
-   * @brief Called when the source window sends us about the selected content.
-   */
-  void OnSelectionNotify( void* data, int type, TWinEventInfo *event );
 
 public:
 
@@ -181,21 +167,6 @@ public:
   virtual void MoveResize( PositionSize positionSize ) override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::ShowIndicator()
-   */
-  virtual void ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode, Dali::Window::IndicatorBgOpacity opacityMode ) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::SetIndicatorProperties()
-   */
-  virtual void SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientation lastOrientation ) override;
-
-  /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::IndicatorTypeChanged()
-   */
-  virtual void IndicatorTypeChanged( IndicatorInterface::Type type ) override;
-
-  /**
    * @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
    */
   virtual void SetClass( const std::string& name, const std::string& className ) override;
@@ -346,11 +317,6 @@ public:
   virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) override;
 
   /**
-   * @copydoc Dali::Internal::Adaptor::WindowBase::SetViewMode()
-   */
-  virtual void SetViewMode( ViewMode viewMode ) override;
-
-  /**
    * @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
    */
   virtual int GetScreenRotationAngle() override;
@@ -370,6 +336,16 @@ public:
    */
   virtual void SetTransparency( bool transparent ) override;
 
+  /**
+   * @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
+   */
+  virtual void SetParent( Any parent ) override;
+
+  /**
+   * @copydoc Dali::Internal::Adaptor::WindowBase::IsMatchedWindow()
+   */
+  virtual bool IsMatchedWindow( Any window ) override;
+
 private:
 
   /**
@@ -389,7 +365,7 @@ private:
    */
   void CreateWinWindow( PositionSize positionSize, bool isTransparent );
 
-protected:
+private:
 
   // Undefined
   WindowBaseWin(const WindowBaseWin&) = delete;
@@ -398,11 +374,12 @@ protected:
   WindowBaseWin& operator=(const WindowBaseWin& rhs) = delete;
 
 private:
+  void EventEntry( TWinEventInfo *event );
 
-  Dali::Vector< Event_Handler >        mEventHandler;
-  Win_Window_Handle                    mWin32Window;        ///< Native window handle
+private:
+  WinWindowHandle                      mWin32Window;        ///< Native window handle
   bool                                 mOwnSurface:1;       ///< Whether we own the surface (responsible for deleting it)
-  bool                                 mIsTransparent;      ///< Whether the window is transparent (32 bit or 24 bit)
+  bool                                 mIsTransparent:1;    ///< Whether the window is transparent (32 bit or 24 bit)
   bool                                 mRotationAppSet:1;
 };