Move xfa/include/fwl/{theme,lightwidget} to xfa/fwl

xfa/fwl/theme/cfwl_scrollbartp.h

Index: xfa/fwl/theme/cfwl_scrollbartp.h
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
similarity index 89%
rename from xfa/include/fwl/theme/scrollbartp.h
rename to xfa/fwl/theme/cfwl_scrollbartp.h
index 5b7145c1551c90c8cf11b107cd48516fe9f2618a..05303930436043820645b4124c7a6b93bf5a8242 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
-#define XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+#ifndef XFA_FWL_THEME_CFWL_SCROLLBARTP_H_
+#define XFA_FWL_THEME_CFWL_SCROLLBARTP_H_
 
-#include "xfa/include/fwl/theme/widgettp.h"
+#include "xfa/fwl/theme/cfwl_widgettp.h"
 
 class CFWL_ScrollBarTP : public CFWL_WidgetTP {
  public:
@@ -21,6 +21,15 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
   virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity);
 
  protected:
+  struct SBThemeData {
+    FX_ARGB clrPawColorLight[4];
+    FX_ARGB clrPawColorDark[4];
+    FX_ARGB clrBtnBK[4][2];
+    FX_ARGB clrBtnBorder[4];
+    FX_ARGB clrTrackBKStart;
+    FX_ARGB clrTrackBKEnd;
+  };
+
   void DrawThumbBtn(CFX_Graphics* pGraphics,
                     const CFX_RectF* pRect,
                     FX_BOOL bVert,
@@ -44,14 +53,8 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
                FWLTHEME_STATE eState,
                CFX_Matrix* pMatrix = NULL);
   void SetThemeData(uint32_t dwID);
-  struct SBThemeData {
-    FX_ARGB clrPawColorLight[4];
-    FX_ARGB clrPawColorDark[4];
-    FX_ARGB clrBtnBK[4][2];
-    FX_ARGB clrBtnBorder[4];
-    FX_ARGB clrTrackBKStart;
-    FX_ARGB clrTrackBKEnd;
-  } * m_pThemeData;
+
+  struct SBThemeData* m_pThemeData;

[Tom Sepez, 2016/03/29 21:24:44]

ditto.

 };
 
-#endif  // XFA_INCLUDE_FWL_THEME_SCROLLBARTP_H_
+#endif  // XFA_FWL_THEME_CFWL_SCROLLBARTP_H_