diff options
| author | Takamichi Horikawa <takamichiho@gmail.com> | 2017-09-24 19:24:17 +0900 |
|---|---|---|
| committer | Takamichi Horikawa <takamichiho@gmail.com> | 2017-09-24 19:24:17 +0900 |
| commit | 1008ae28bfa7265a6c1990b4452e8ba23d5d8727 (patch) | |
| tree | 10fda2515aabf41aa399ae084b21db909c641996 | |
| parent | e16e86b42f626ca3ef64a6eff30aa442d7710642 (diff) | |
make code independent of -DUNICODE
| -rw-r--r-- | common/winfont.c (renamed from win32/winfont.c) | 19 | ||||
| -rw-r--r-- | common/winfont.h (renamed from win32/winfont.h) | 0 |
2 files changed, 9 insertions, 10 deletions
diff --git a/win32/winfont.c b/common/winfont.c index 1ed7a78..a79952b 100644 --- a/win32/winfont.c +++ b/common/winfont.c @@ -70,7 +70,7 @@ static const void *winfont_get(const struct fmdsp_font *font, switch (type) { case FMDSP_FONT_ANK: text[0] = jis2unih(c); - TextOut(fw->dc, 0, 0, text, 1); + TextOutW(fw->dc, 0, 0, text, 1); break; case FMDSP_FONT_JIS_LEFT: { @@ -86,11 +86,11 @@ static const void *winfont_get(const struct fmdsp_font *font, text[0] = jis2uni(c); } } - TextOut(fw->dc, 0, 0, text, 1); + TextOutW(fw->dc, 0, 0, text, 1); break; case FMDSP_FONT_JIS_RIGHT: text[0] = jis2uni(c); - TextOut(fw->dc, -8, 0, text, 1); + TextOutW(fw->dc, -8, 0, text, 1); break; } GdiFlush(); @@ -111,12 +111,12 @@ bool fmdsp_font_win(struct fmdsp_font *font) { GetProcessHeap(), 0, sizeof(struct font_win32) ); if (!fw) goto err; - fw->font = CreateFont(16, 0, 0, 0, - FW_NORMAL, FALSE, FALSE, FALSE, - SHIFTJIS_CHARSET, - OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, - NONANTIALIASED_QUALITY, FIXED_PITCH, - L"MS Gothic"); + fw->font = CreateFontW(16, 0, 0, 0, + FW_NORMAL, FALSE, FALSE, FALSE, + SHIFTJIS_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, + NONANTIALIASED_QUALITY, FIXED_PITCH, + L"MS Gothic"); if (!fw->font) goto err_fw; fw->dc = CreateCompatibleDC(0); if (!fw->dc) goto err_font; @@ -137,7 +137,6 @@ bool fmdsp_font_win(struct fmdsp_font *font) { DIB_RGB_COLORS, (void **)&fw->data, 0, 0); if (!fw->bitmap) { - MessageBox(0, L"a", L"b", 0); goto err_dc; } SelectObject(fw->dc, fw->bitmap); diff --git a/win32/winfont.h b/common/winfont.h index 204b7fb..204b7fb 100644 --- a/win32/winfont.h +++ b/common/winfont.h |