summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp2
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h16
2 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index 1eade9c70b..630da7793d 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -303,7 +303,7 @@ CFWL_FontManager::CFWL_FontManager() {}
CFWL_FontManager::~CFWL_FontManager() {}
-CFX_RetainPtr<CFGAS_GEFont> CFWL_FontManager::FindFont(
+RetainPtr<CFGAS_GEFont> CFWL_FontManager::FindFont(
const WideStringView& wsFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage) {
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index dd36778704..eb1423e602 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -10,9 +10,9 @@
#include <memory>
#include <vector>
-#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
+#include "core/fxcrt/retain_ptr.h"
#include "xfa/fgas/font/cfgas_gefont.h"
#include "xfa/fwl/theme/cfwl_utils.h"
#include "xfa/fxgraphics/cxfa_graphics.h"
@@ -39,7 +39,7 @@ class CFWL_WidgetTP {
virtual void DrawBackground(CFWL_ThemeBackground* pParams);
virtual void DrawText(CFWL_ThemeText* pParams);
- const CFX_RetainPtr<CFGAS_GEFont>& GetFont() const { return m_pFDEFont; }
+ const RetainPtr<CFGAS_GEFont>& GetFont() const { return m_pFDEFont; }
protected:
struct CColorData {
@@ -95,7 +95,7 @@ class CFWL_WidgetTP {
uint32_t m_dwRefCount;
std::unique_ptr<CFDE_TextOut> m_pTextOut;
- CFX_RetainPtr<CFGAS_GEFont> m_pFDEFont;
+ RetainPtr<CFGAS_GEFont> m_pFDEFont;
std::unique_ptr<CColorData> m_pColorData;
};
@@ -112,7 +112,7 @@ class CFWL_FontData {
bool LoadFont(const WideStringView& wsFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage);
- CFX_RetainPtr<CFGAS_GEFont> GetFont() const { return m_pFont; }
+ RetainPtr<CFGAS_GEFont> GetFont() const { return m_pFont; }
protected:
WideString m_wsFamily;
@@ -122,7 +122,7 @@ class CFWL_FontData {
std::unique_ptr<CFX_FontSourceEnum_File> m_pFontSource;
#endif
std::unique_ptr<CFGAS_FontMgr> m_pFontMgr;
- CFX_RetainPtr<CFGAS_GEFont> m_pFont;
+ RetainPtr<CFGAS_GEFont> m_pFont;
};
class CFWL_FontManager {
@@ -130,9 +130,9 @@ class CFWL_FontManager {
static CFWL_FontManager* GetInstance();
static void DestroyInstance();
- CFX_RetainPtr<CFGAS_GEFont> FindFont(const WideStringView& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t dwCodePage);
+ RetainPtr<CFGAS_GEFont> FindFont(const WideStringView& wsFontFamily,
+ uint32_t dwFontStyles,
+ uint16_t dwCodePage);
protected:
CFWL_FontManager();