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

xfa/fwl/theme/cfwl_pushbuttontp.h

Index: xfa/fwl/theme/cfwl_pushbuttontp.h
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/fwl/theme/cfwl_pushbuttontp.h
similarity index 85%
rename from xfa/include/fwl/theme/pushbuttontp.h
rename to xfa/fwl/theme/cfwl_pushbuttontp.h
index b951de0bedea3400ab92a1350f2dfc836fa253e6..b72ac86126de8000ce22834123974bbb3764ea5d 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
-#define XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+#ifndef XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_
+#define XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_
 
-#include "xfa/include/fwl/theme/widgettp.h"
+#include "xfa/fwl/theme/cfwl_widgettp.h"
 
 class CFWL_PushButtonTP : public CFWL_WidgetTP {
  public:
@@ -23,6 +23,13 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP {
   virtual FWL_ERR Finalize();
 
  protected:
+  struct PBThemeData {
+    FX_ARGB clrBorder[5];
+    FX_ARGB clrStart[5];
+    FX_ARGB clrEnd[5];
+    FX_ARGB clrFill[5];
+  };
+
   void SetThemeData(uint32_t dwID);
   void SetTopLineColor(uint32_t* pData);
   void SetLeftLineColor(uint32_t* pData);
@@ -33,12 +40,7 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP {
   void SetCornerColor(uint32_t* pData);
   int32_t GetColorID(uint32_t dwStates);
 
-  struct PBThemeData {
-    FX_ARGB clrBorder[5];
-    FX_ARGB clrStart[5];
-    FX_ARGB clrEnd[5];
-    FX_ARGB clrFill[5];
-  } * m_pThemeData;
+  struct PBThemeData* m_pThemeData;

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

nit: "struct" not needed here.

 };
 
-#endif  // XFA_INCLUDE_FWL_THEME_PUSHBUTTONTP_H_
+#endif  // XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_