summaryrefslogtreecommitdiff
path: root/core/src/fxge
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/fxge')
-rw-r--r--core/src/fxge/win32/fx_win32_gdipext.cpp7
-rw-r--r--core/src/fxge/win32/fx_win32_print.cpp6
-rw-r--r--core/src/fxge/win32/win32_int.h2
3 files changed, 8 insertions, 7 deletions
diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp
index 629f3235ed..aba67dacfe 100644
--- a/core/src/fxge/win32/fx_win32_gdipext.cpp
+++ b/core/src/fxge/win32/fx_win32_gdipext.cpp
@@ -16,11 +16,12 @@ using std::max;
} // namespace Gdiplus
#include <gdiplus.h>
+
#include "core/include/fxge/fx_ge_win32.h"
#include "core/src/fxge/win32/win32_int.h"
-using namespace Gdiplus;
-using namespace Gdiplus::DllExports;
+using namespace Gdiplus; // NOLINT
+using namespace Gdiplus::DllExports; // NOLINT
#define GdiFillType2Gdip(fill_type) \
(fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding)
@@ -420,7 +421,7 @@ typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawImageRectI)(GpGraphics* graphics,
INT height);
typedef GpStatus(WINGDIPAPI* FuncType_GdipDrawString)(
GpGraphics* graphics,
- GDIPCONST WCHAR* string,
+ GDIPCONST WCHAR* str,
INT length,
GDIPCONST GpFont* font,
GDIPCONST RectF* layoutRect,
diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp
index 6c262d83dc..acd73d1427 100644
--- a/core/src/fxge/win32/fx_win32_print.cpp
+++ b/core/src/fxge/win32/fx_win32_print.cpp
@@ -287,15 +287,15 @@ CPSOutput::~CPSOutput() {
void CPSOutput::Init() {
m_pBuf = FX_Alloc(FX_CHAR, 1026);
}
-void CPSOutput::OutputPS(const FX_CHAR* string, int len) {
+void CPSOutput::OutputPS(const FX_CHAR* str, int len) {
if (len < 0) {
- len = (int)FXSYS_strlen(string);
+ len = (int)FXSYS_strlen(str);
}
int sent_len = 0;
while (len > 0) {
int send_len = len > 1024 ? 1024 : len;
*(FX_WORD*)m_pBuf = send_len;
- FXSYS_memcpy(m_pBuf + 2, string + sent_len, send_len);
+ FXSYS_memcpy(m_pBuf + 2, str + sent_len, send_len);
ExtEscape(m_hDC, PASSTHROUGH, send_len + 2, m_pBuf, 0, NULL);
sent_len += send_len;
len -= send_len;
diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h
index 97da0ac15c..233fe367f5 100644
--- a/core/src/fxge/win32/win32_int.h
+++ b/core/src/fxge/win32/win32_int.h
@@ -277,7 +277,7 @@ class CPSOutput : public IFX_PSOutput {
// IFX_PSOutput
void Release() override { delete this; }
- void OutputPS(const FX_CHAR* string, int len) override;
+ void OutputPS(const FX_CHAR* str, int len) override;
void Init();