More FWL interface cleanup.

xfa/fwl/core/fwl_widgetimp.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_FWL_WIDGETIMP_H_
 #define XFA_FWL_CORE_FWL_WIDGETIMP_H_
 
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "xfa/fwl/core/cfwl_event.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/fwl_targetimp.h"
 #include "xfa/fwl/core/ifwl_widgetdelegate.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
+class CFWL_AppImp;
 class CFWL_MsgKey;
-class CFWL_ThreadImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetMgr;
+class IFWL_App;
 class IFWL_DataProvider;
-class IFWL_Thread;
 class IFWL_ThemeProvider;
 class IFWL_Widget;
 
-class CFWL_WidgetImp : public CFWL_TargetImp {
+class CFWL_WidgetImp {
  public:
+  virtual ~CFWL_WidgetImp();
+
   virtual FWL_ERR Initialize();
   virtual FWL_ERR Finalize();
+  virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
+  virtual uint32_t GetClassID() const;
+  virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
 
   virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
   virtual FWL_ERR GetGlobalRect(CFX_RectF& rect);
   virtual FWL_ERR SetWidgetRect(const CFX_RectF& rect);
   virtual FWL_ERR GetClientRect(CFX_RectF& rect);
   virtual IFWL_Widget* GetParent();
   virtual FWL_ERR SetParent(IFWL_Widget* pParent);
   virtual IFWL_Widget* GetOwner();
   virtual FWL_ERR SetOwner(IFWL_Widget* pOwner);
   virtual IFWL_Widget* GetOuter();
@@ skipping 16 matching lines @@
   virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
   virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt);
   virtual FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
   virtual FWL_ERR SetMatrix(const CFX_Matrix& matrix);
   virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
                              const CFX_Matrix* pMatrix = NULL);
   virtual IFWL_ThemeProvider* GetThemeProvider();
   virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
   virtual FWL_ERR SetDataProvider(IFWL_DataProvider* pDataProvider);
   virtual IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate);
-  virtual IFWL_Thread* GetOwnerThread() const;
-  FWL_ERR SetOwnerThread(CFWL_ThreadImp* pOwnerThread);
+  virtual IFWL_App* GetOwnerThread() const;
+  FWL_ERR SetOwnerThread(CFWL_AppImp* pOwnerThread);
   IFWL_Widget* GetInterface() const;
   void SetInterface(IFWL_Widget* pInterface);
   CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);
 
  protected:
+  friend class CFWL_WidgetImpDelegate;
+
   CFWL_WidgetImp(const CFWL_WidgetImpProperties& properties,
                  IFWL_Widget* pOuter);
-  virtual ~CFWL_WidgetImp();
+
   FX_BOOL IsEnabled() const;
   FX_BOOL IsVisible() const;
   FX_BOOL IsActive() const;
   FX_BOOL IsOverLapper() const;
   FX_BOOL IsPopup() const;
   FX_BOOL IsChild() const;
   FX_BOOL IsLocked() const;
   FX_BOOL IsOffscreen() const;
   FX_BOOL HasBorder() const;
   FX_BOOL HasEdge() const;
@@ skipping 47 matching lines @@
                   IFWL_ThemeProvider* pTheme,
                   const CFX_Matrix* pMatrix = NULL);
   void DrawEdge(CFX_Graphics* pGraphics,
                 CFWL_Part iPartEdge,
                 IFWL_ThemeProvider* pTheme,
                 const CFX_Matrix* pMatrix = NULL);
   void NotifyDriver();
 
   FX_BOOL IsParent(IFWL_Widget* pParent);
 
-  friend class CFWL_WidgetImpDelegate;
-
   CFWL_WidgetMgr* m_pWidgetMgr;
-  CFWL_ThreadImp* m_pOwnerThread;
+  CFWL_AppImp* m_pOwnerThread;

[Tom Sepez, 2016/04/27 20:23:34]

ditto on "thread"

[dsinclair, 2016/04/27 20:58:55]

Done.

   CFWL_WidgetImpProperties* m_pProperties;
   CFX_PrivateData* m_pPrivateData;
   IFWL_WidgetDelegate* m_pDelegate;
   IFWL_WidgetDelegate* m_pCurDelegate;
   IFWL_Widget* m_pOuter;
   IFWL_Widget* m_pInterface;
   int32_t m_iLock;
 };
 
 class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
  public:
   CFWL_WidgetImpDelegate();
   ~CFWL_WidgetImpDelegate() override {}
   int32_t OnProcessMessage(CFWL_Message* pMessage) override;
   FWL_ERR OnProcessEvent(CFWL_Event* pEvent) override;
   FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = NULL) override;
 };
 
 #endif  // XFA_FWL_CORE_FWL_WIDGETIMP_H_