Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fwl / src / basewidget / fwl_monthcalendarimp.cpp
index aed4763..c99b5c6 100644 (file)
@@ -398,7 +398,7 @@ void CFWL_MonthCalendarImp::DrawWeekNumber(CFX_Graphics *pGraphics, IFWL_ThemePr
         iTemp ++;\r
         iWeekNum = CalWeekNumber(m_iCurYear, iMonthNum, i);\r
         m_rtWeekNum.Set(fHStartPos, fVStartPos + m_fDateCellHei * iTemp, m_fWeekNumWid, m_fDateCellHei);\r
-        wsWeekNum.Format(FX_LPCWSTR(L"%d"), iWeekNum);\r
+        wsWeekNum.Format(L"%d", iWeekNum);\r
         params.m_wsText = wsWeekNum;\r
         params.m_rtPart = m_rtWeekNum;\r
         pTheme->DrawText(&params);\r
@@ -765,7 +765,7 @@ void CFWL_MonthCalendarImp::ReSetDateItem()
             iDayOfWeek = 0;\r
         }\r
         CFX_WideString wsDay;\r
-        wsDay.Format(FX_LPCWSTR(L"%d"), i + 1);\r
+        wsDay.Format(L"%d", i + 1);\r
         FX_DWORD dwStates = 0;\r
         if (m_iYear == m_iCurYear && m_iMonth == m_iCurMonth && m_iDay == (i + 1)) {\r
             dwStates |= FWL_ITEMSTATE_MCD_Flag;\r
@@ -888,25 +888,25 @@ FX_BOOL   CFWL_MonthCalendarImp::JumpToToday()
 void CFWL_MonthCalendarImp::GetHeadText(int32_t iYear, int32_t iMonth, CFX_WideString &wsHead)\r
 {\r
     FXSYS_assert(iMonth > 0 && iMonth < 13);\r
-    static FX_LPWSTR pMonth[] = {\r
-        FX_LPWSTR(L"January"),\r
-        FX_LPWSTR(L"February"),\r
-        FX_LPWSTR(L"March"),\r
-        FX_LPWSTR(L"April"),\r
-        FX_LPWSTR(L"May"),\r
-        FX_LPWSTR(L"June"),\r
-        FX_LPWSTR(L"July"),\r
-        FX_LPWSTR(L"August"),\r
-        FX_LPWSTR(L"September"),\r
-        FX_LPWSTR(L"October"),\r
-        FX_LPWSTR(L"November"),\r
-        FX_LPWSTR(L"December")\r
+    static const FX_WCHAR* const pMonth[] = {\r
+        L"January",\r
+        L"February",\r
+        L"March",\r
+        L"April",\r
+        L"May",\r
+        L"June",\r
+        L"July",\r
+        L"August",\r
+        L"September",\r
+        L"October",\r
+        L"November",\r
+        L"December"\r
     };\r
-    wsHead.Format(FX_LPCWSTR(L"%s, %d"), pMonth[iMonth - 1], iYear);\r
+    wsHead.Format(L"%s, %d", pMonth[iMonth - 1], iYear);\r
 }\r
 void CFWL_MonthCalendarImp::GetTodayText(int32_t iYear, int32_t iMonth, int32_t iDay, CFX_WideString &wsToday)\r
 {\r
-    wsToday.Format(FX_LPCWSTR(L", %d/%d/%d"), iDay, iMonth, iYear);\r
+    wsToday.Format(L", %d/%d/%d", iDay, iMonth, iYear);\r
 }\r
 int32_t CFWL_MonthCalendarImp::GetDayAtPoint(FX_FLOAT x, FX_FLOAT y)\r
 {\r