diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-12-09 11:56:39 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-12-09 11:56:39 -0800 |
| commit | df685030b73074e46d7eb789e13135c52775091f (patch) | |
| tree | cfc7c0023d0f4e088876c991a3e37ec50e081285 /xfa/include/fwl/lightwidget | |
| parent | 0f05b1c9c19e9f45135bb3dd21044b2e69fe086a (diff) | |
| download | pdfium-df685030b73074e46d7eb789e13135c52775091f.tar.xz | |
Re-land "Rename CFWL_Thread classes to ThreadImp"
This reverts commit 5e4f290e939ded90a518ff8eab1db59930655e11.
BUG=
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1502063005 .
Diffstat (limited to 'xfa/include/fwl/lightwidget')
| -rw-r--r-- | xfa/include/fwl/lightwidget/app.h | 23 | ||||
| -rw-r--r-- | xfa/include/fwl/lightwidget/theme.h | 53 |
2 files changed, 41 insertions, 35 deletions
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h index 367e732f5c..053bc61c99 100644 --- a/xfa/include/fwl/lightwidget/app.h +++ b/xfa/include/fwl/lightwidget/app.h @@ -4,22 +4,25 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_APP_LIGHT_H
-#define _FWL_APP_LIGHT_H
+#ifndef FWL_LIGHTWIDGET_APP_H_
+#define FWL_LIGHTWIDGET_APP_H_
+
class CFWL_Theme;
class IFWL_App;
-class CFWL_App;
+
class CFWL_App {
public:
CFWL_App();
virtual ~CFWL_App();
+
FWL_ERR Initialize();
- CFWL_Theme* GetTheme();
- FWL_ERR Exit(int32_t iExitCode = 0);
- IFWL_App* GetApp();
+ FWL_ERR Exit(int32_t iExitCode);
+
+ CFWL_Theme* GetTheme() const { return m_pTheme; }
+ IFWL_App* GetInterface() const { return m_pIface; }
- protected:
- IFWL_App* m_pAppImp;
- CFWL_Theme* m_pThemeProvider;
+ private:
+ IFWL_App* m_pIface;
+ CFWL_Theme* m_pTheme;
};
-#endif
+#endif // FWL_LIGHTWIDGET_APP_H_
diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h index f5945f377d..c58f043a36 100644 --- a/xfa/include/fwl/lightwidget/theme.h +++ b/xfa/include/fwl/lightwidget/theme.h @@ -6,35 +6,38 @@ #ifndef _FWL_THEME_LIGHT_H
#define _FWL_THEME_LIGHT_H
-class CFWL_ThemeBackground;
-class CFWL_ThemeText;
-class CFWL_ThemePart;
+
+#include "xfa/include/fwl/core/fwl_theme.h"
+
class CFWL_WidgetTP;
class IFWL_Widget;
-class CFWL_Theme;
-class CFWL_Theme {
+
+class CFWL_Theme : public IFWL_ThemeProvider {
public:
- virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget);
- virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget);
- virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
- FX_DWORD dwThemeID,
- FX_BOOL bChildren = TRUE);
- virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix);
- virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,
- const CFX_Matrix& matrix);
- virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams);
- virtual FX_BOOL DrawText(CFWL_ThemeText* pParams);
- virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity);
- virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget);
- virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart);
- virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
- FX_FLOAT fx,
- FX_FLOAT fy);
- virtual FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect);
- virtual FWL_ERR Initialize();
- virtual FWL_ERR Finalize();
CFWL_Theme();
- virtual ~CFWL_Theme();
+ ~CFWL_Theme() override;
+
+ // IFWL_ThemeProvider:
+ FX_BOOL IsValidWidget(IFWL_Widget* pWidget) override;
+ FX_DWORD GetThemeID(IFWL_Widget* pWidget) override;
+ FX_DWORD SetThemeID(IFWL_Widget* pWidget,
+ FX_DWORD dwThemeID,
+ FX_BOOL bChildren = TRUE) override;
+ FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) override;
+ FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,
+ const CFX_Matrix& matrix) override;
+ FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override;
+ FX_BOOL DrawText(CFWL_ThemeText* pParams) override;
+ void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) override;
+ FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) override;
+ FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override;
+ FX_BOOL IsInPart(CFWL_ThemePart* pThemePart,
+ FX_FLOAT fx,
+ FX_FLOAT fy) override;
+ FX_BOOL CalcTextRect(CFWL_ThemeText* pParams, CFX_RectF& rect) override;
+
+ FWL_ERR Initialize();
+ FWL_ERR Finalize();
FWL_ERR SetFont(IFWL_Widget* pWidget,
const FX_WCHAR* strFont,
FX_FLOAT fFontSize,
|