summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/cfwl_barcode.cpp2
-rw-r--r--xfa/fwl/cfwl_edit.cpp4
-rw-r--r--xfa/fwl/cfwl_themebackground.h2
-rw-r--r--xfa/fwl/cfx_barcode_unittest.cpp2
-rw-r--r--xfa/fwl/ifwl_themeprovider.h5
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp2
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h16
7 files changed, 16 insertions, 17 deletions
diff --git a/xfa/fwl/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp
index 1f2a978171..f5d6ea98b2 100644
--- a/xfa/fwl/cfwl_barcode.cpp
+++ b/xfa/fwl/cfwl_barcode.cpp
@@ -167,7 +167,7 @@ void CFWL_Barcode::GenerateBarcodeImageCache() {
if (pTheme) {
CFWL_ThemePart part;
part.m_pWidget = this;
- if (CFX_RetainPtr<CFGAS_GEFont> pFont = pTheme->GetFont(&part)) {
+ if (RetainPtr<CFGAS_GEFont> pFont = pTheme->GetFont(&part)) {
if (CFX_Font* pCXFont = pFont->GetDevFont())
m_pBarcodeEngine->SetFont(pCXFont);
}
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index d1f0c99a39..fa5ee63b77 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -538,7 +538,7 @@ void CFWL_Edit::RenderText(CFX_RenderDevice* pRenderDev,
const CFX_Matrix& mt) {
ASSERT(pRenderDev);
- CFX_RetainPtr<CFGAS_GEFont> font = m_EdtEngine.GetFont();
+ RetainPtr<CFGAS_GEFont> font = m_EdtEngine.GetFont();
if (!font)
return;
@@ -635,7 +635,7 @@ void CFWL_Edit::UpdateEditParams() {
}
m_fFontSize = theme->GetFontSize(&part);
- CFX_RetainPtr<CFGAS_GEFont> pFont = theme->GetFont(&part);
+ RetainPtr<CFGAS_GEFont> pFont = theme->GetFont(&part);
if (!pFont)
return;
diff --git a/xfa/fwl/cfwl_themebackground.h b/xfa/fwl/cfwl_themebackground.h
index 0141754c1e..65c29ebd7a 100644
--- a/xfa/fwl/cfwl_themebackground.h
+++ b/xfa/fwl/cfwl_themebackground.h
@@ -21,7 +21,7 @@ class CFWL_ThemeBackground : public CFWL_ThemePart {
CXFA_Graphics* m_pGraphics;
CXFA_Path* m_pPath;
- CFX_RetainPtr<CFX_DIBitmap> m_pImage;
+ RetainPtr<CFX_DIBitmap> m_pImage;
};
inline CFWL_ThemeBackground::CFWL_ThemeBackground()
diff --git a/xfa/fwl/cfx_barcode_unittest.cpp b/xfa/fwl/cfx_barcode_unittest.cpp
index b66d90495e..fe8aee4709 100644
--- a/xfa/fwl/cfx_barcode_unittest.cpp
+++ b/xfa/fwl/cfx_barcode_unittest.cpp
@@ -64,7 +64,7 @@ class BarcodeTest : public testing::Test {
CFX_Matrix matrix_;
std::unique_ptr<CFX_Barcode> barcode_;
std::unique_ptr<CFX_RenderDevice> device_;
- CFX_RetainPtr<CFX_DIBitmap> bitmap_;
+ RetainPtr<CFX_DIBitmap> bitmap_;
};
TEST_F(BarcodeTest, Code39) {
diff --git a/xfa/fwl/ifwl_themeprovider.h b/xfa/fwl/ifwl_themeprovider.h
index 03767cfc06..32dc901377 100644
--- a/xfa/fwl/ifwl_themeprovider.h
+++ b/xfa/fwl/ifwl_themeprovider.h
@@ -7,8 +7,8 @@
#ifndef XFA_FWL_IFWL_THEMEPROVIDER_H_
#define XFA_FWL_IFWL_THEMEPROVIDER_H_
-#include "core/fxcrt/cfx_retain_ptr.h"
#include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/retain_ptr.h"
#include "xfa/fgas/font/cfgas_gefont.h"
class CFWL_ThemeBackground;
@@ -27,8 +27,7 @@ class IFWL_ThemeProvider {
virtual float GetCYBorderSize() const = 0;
virtual CFX_RectF GetUIMargin(CFWL_ThemePart* pThemePart) const = 0;
virtual float GetFontSize(CFWL_ThemePart* pThemePart) const = 0;
- virtual CFX_RetainPtr<CFGAS_GEFont> GetFont(
- CFWL_ThemePart* pThemePart) const = 0;
+ virtual RetainPtr<CFGAS_GEFont> GetFont(CFWL_ThemePart* pThemePart) const = 0;
virtual float GetLineHeight(CFWL_ThemePart* pThemePart) const = 0;
virtual float GetScrollBarWidth() const = 0;
virtual FX_COLORREF GetTextColor(CFWL_ThemePart* pThemePart) const = 0;
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 12:04:12 +0000