summaryrefslogtreecommitdiff
path: root/xfa/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl')
-rw-r--r--xfa/fwl/cfwl_barcode.cpp4
-rw-r--r--xfa/fwl/cfwl_barcode.h8
-rw-r--r--xfa/fwl/cfwl_edit.cpp10
-rw-r--r--xfa/fwl/cfwl_edit.h4
-rw-r--r--xfa/fwl/cfwl_monthcalendar.cpp8
-rw-r--r--xfa/fwl/cfx_barcode.cpp8
-rw-r--r--xfa/fwl/cfx_barcode.h4
7 files changed, 23 insertions, 23 deletions
diff --git a/xfa/fwl/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp
index 0412b86958..e894d25d64 100644
--- a/xfa/fwl/cfwl_barcode.cpp
+++ b/xfa/fwl/cfwl_barcode.cpp
@@ -136,12 +136,12 @@ void CFWL_Barcode::SetWideNarrowRatio(int32_t ratio) {
m_nWideNarrowRatio = ratio;
}
-void CFWL_Barcode::SetStartChar(FX_CHAR startChar) {
+void CFWL_Barcode::SetStartChar(char startChar) {
m_dwAttributeMask |= FWL_BCDATTRIBUTE_STARTCHAR;
m_cStartChar = startChar;
}
-void CFWL_Barcode::SetEndChar(FX_CHAR endChar) {
+void CFWL_Barcode::SetEndChar(char endChar) {
m_dwAttributeMask |= FWL_BCDATTRIBUTE_ENDCHAR;
m_cEndChar = endChar;
}
diff --git a/xfa/fwl/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h
index 2e9799172b..101cc602fb 100644
--- a/xfa/fwl/cfwl_barcode.h
+++ b/xfa/fwl/cfwl_barcode.h
@@ -63,8 +63,8 @@ class CFWL_Barcode : public CFWL_Edit {
void SetPrintChecksum(bool printChecksum);
void SetTextLocation(BC_TEXT_LOC location);
void SetWideNarrowRatio(int32_t ratio);
- void SetStartChar(FX_CHAR startChar);
- void SetEndChar(FX_CHAR endChar);
+ void SetStartChar(char startChar);
+ void SetEndChar(char endChar);
void SetErrorCorrectionLevel(int32_t ecLevel);
void SetTruncated(bool truncated);
@@ -83,8 +83,8 @@ class CFWL_Barcode : public CFWL_Edit {
bool m_bPrintChecksum;
BC_TEXT_LOC m_eTextLocation;
int32_t m_nWideNarrowRatio;
- FX_CHAR m_cStartChar;
- FX_CHAR m_cEndChar;
+ char m_cStartChar;
+ char m_cEndChar;
int32_t m_nECLevel;
bool m_bTruncated;
uint32_t m_dwAttributeMask;
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index a7c85d57b7..b3b05a52d0 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -38,7 +38,7 @@ namespace {
const int kEditMargin = 3;
-bool FX_EDIT_ISLATINWORD(FX_WCHAR c) {
+bool FX_EDIT_ISLATINWORD(wchar_t c) {
return c == 0x2D || (c <= 0x005A && c >= 0x0041) ||
(c <= 0x007A && c >= 0x0061) || (c <= 0x02AF && c >= 0x00C0) ||
c == 0x0027;
@@ -203,7 +203,7 @@ void CFWL_Edit::DrawSpellCheck(CFX_Graphics* pGraphics,
if (FX_EDIT_ISLATINWORD(wsSpell[i])) {
if (sLatinWord.IsEmpty())
nStart = i;
- sLatinWord += (FX_CHAR)wsSpell[i];
+ sLatinWord += (char)wsSpell[i];
continue;
}
checkWordEvent.bsWord = sLatinWord;
@@ -314,7 +314,7 @@ void CFWL_Edit::SetLimit(int32_t nLimit) {
m_EdtEngine.SetLimit(nLimit);
}
-void CFWL_Edit::SetAliasChar(FX_WCHAR wAlias) {
+void CFWL_Edit::SetAliasChar(wchar_t wAlias) {
m_EdtEngine.SetAliasChar(wAlias);
}
@@ -1137,7 +1137,7 @@ void CFWL_Edit::HideCaret(CFX_RectF* pRect) {
pDocEnvironment->DisplayCaret(pXFAWidget, false, pRect);
}
-bool CFWL_Edit::ValidateNumberChar(FX_WCHAR cNum) {
+bool CFWL_Edit::ValidateNumberChar(wchar_t cNum) {
if (!m_bSetRange)
return true;
@@ -1434,7 +1434,7 @@ void CFWL_Edit::OnChar(CFWL_MessageKey* pMsg) {
}
int32_t iError = 0;
- FX_WCHAR c = static_cast<FX_WCHAR>(pMsg->m_dwKeyCode);
+ wchar_t c = static_cast<wchar_t>(pMsg->m_dwKeyCode);
int32_t nCaret = m_EdtEngine.GetCaretPos();
switch (c) {
case FWL_VKEY_Back:
diff --git a/xfa/fwl/cfwl_edit.h b/xfa/fwl/cfwl_edit.h
index 154e286331..13e4be2c68 100644
--- a/xfa/fwl/cfwl_edit.h
+++ b/xfa/fwl/cfwl_edit.h
@@ -80,7 +80,7 @@ class CFWL_Edit : public CFWL_Widget {
void ClearSelections();
int32_t GetLimit() const;
void SetLimit(int32_t nLimit);
- void SetAliasChar(FX_WCHAR wAlias);
+ void SetAliasChar(wchar_t wAlias);
bool Copy(CFX_WideString& wsCopy);
bool Cut(CFX_WideString& wsCut);
bool Paste(const CFX_WideString& wsPaste);
@@ -132,7 +132,7 @@ class CFWL_Edit : public CFWL_Widget {
void InitHorizontalScrollBar();
void InitEngine();
void InitCaret();
- bool ValidateNumberChar(FX_WCHAR cNum);
+ bool ValidateNumberChar(wchar_t cNum);
void ClearRecord();
bool IsShowScrollBar(bool bVert);
bool IsContentHeightOverflow();
diff --git a/xfa/fwl/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
index 6882d709bf..2dcac03731 100644
--- a/xfa/fwl/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -674,10 +674,10 @@ void CFWL_MonthCalendar::JumpToToday() {
CFX_WideString CFWL_MonthCalendar::GetHeadText(int32_t iYear, int32_t iMonth) {
ASSERT(iMonth > 0 && iMonth < 13);
- static const FX_WCHAR* const pMonth[] = {
- L"January", L"February", L"March", L"April",
- L"May", L"June", L"July", L"August",
- L"September", L"October", L"November", L"December"};
+ static const wchar_t* const pMonth[] = {L"January", L"February", L"March",
+ L"April", L"May", L"June",
+ L"July", L"August", L"September",
+ L"October", L"November", L"December"};
CFX_WideString wsHead;
wsHead.Format(L"%s, %d", pMonth[iMonth - 1], iYear);
return wsHead;
diff --git a/xfa/fwl/cfx_barcode.cpp b/xfa/fwl/cfx_barcode.cpp
index 7af3aa1888..1c22367901 100644
--- a/xfa/fwl/cfx_barcode.cpp
+++ b/xfa/fwl/cfx_barcode.cpp
@@ -235,8 +235,8 @@ bool CFX_Barcode::SetWideNarrowRatio(int32_t ratio) {
return m_pBCEngine && memptr ? (m_pBCEngine.get()->*memptr)(ratio) : false;
}
-bool CFX_Barcode::SetStartChar(FX_CHAR start) {
- typedef bool (CBC_CodeBase::*memptrtype)(FX_CHAR);
+bool CFX_Barcode::SetStartChar(char start) {
+ typedef bool (CBC_CodeBase::*memptrtype)(char);
memptrtype memptr = nullptr;
switch (GetType()) {
case BC_CODABAR:
@@ -248,8 +248,8 @@ bool CFX_Barcode::SetStartChar(FX_CHAR start) {
return m_pBCEngine && memptr ? (m_pBCEngine.get()->*memptr)(start) : false;
}
-bool CFX_Barcode::SetEndChar(FX_CHAR end) {
- typedef bool (CBC_CodeBase::*memptrtype)(FX_CHAR);
+bool CFX_Barcode::SetEndChar(char end) {
+ typedef bool (CBC_CodeBase::*memptrtype)(char);
memptrtype memptr = nullptr;
switch (GetType()) {
case BC_CODABAR:
diff --git a/xfa/fwl/cfx_barcode.h b/xfa/fwl/cfx_barcode.h
index f639977cfc..3f4b340d95 100644
--- a/xfa/fwl/cfx_barcode.h
+++ b/xfa/fwl/cfx_barcode.h
@@ -52,8 +52,8 @@ class CFX_Barcode {
bool SetTextLocation(BC_TEXT_LOC location);
bool SetWideNarrowRatio(int32_t ratio);
- bool SetStartChar(FX_CHAR start);
- bool SetEndChar(FX_CHAR end);
+ bool SetStartChar(char start);
+ bool SetEndChar(char end);
bool SetVersion(int32_t version);
bool SetErrorCorrectionLevel(int32_t level);
bool SetTruncated(bool truncated);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 22:59:50 +0000