From 96101e2721d4cb277bf0b9d02f077dc2dd9087d8 Mon Sep 17 00:00:00 2001 From: sje Date: Thu, 23 Nov 2006 03:20:39 +0000 Subject: rebuild using standard (George's) m_fontservice.h (encoding ambivalent) fix errors to allow pure ansi build git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@55 4f64403b-2f21-0410-a795-97e2b3489a10 --- font_service/options.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'font_service/options.cpp') diff --git a/font_service/options.cpp b/font_service/options.cpp index b3e825a..8cc9baf 100644 --- a/font_service/options.cpp +++ b/font_service/options.cpp @@ -19,7 +19,7 @@ void WriteLine(HANDLE fhand, char *line) { bool ExportSettings(HWND hwndDlg, TCHAR *filename, FontIDWList flist, ColourIDWList clist) { HANDLE fhand = CreateFile(filename, GENERIC_WRITE, 0, 0, CREATE_ALWAYS, 0, 0); if(fhand == INVALID_HANDLE_VALUE) { - MessageBox(hwndDlg, filename, L"Failed to create file", MB_ICONWARNING | MB_OK); + MessageBox(hwndDlg, filename, _T("Failed to create file"), MB_ICONWARNING | MB_OK); return false; } @@ -64,7 +64,7 @@ bool ExportSettings(HWND hwndDlg, TCHAR *filename, FontIDWList flist, ColourIDWL // it->second.style & DBFONTF_ITALIC ? 1 : 0, 0, 0, it->second.charset, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, it->second.szFace); hdc = GetDC(hwndDlg); hOldFont = (HFONT)SelectObject(hdc, hFont); - GetTextExtentPoint32(hdc, L"_W", 2, &size); + GetTextExtentPoint32(hdc, _T("_W"), 2, &size); ReleaseDC(hwndDlg, hdc); SelectObject(hdc, hOldFont); DeleteObject(hFont); @@ -523,14 +523,14 @@ static BOOL CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP ofn.nMaxFile = MAX_PATH; ofn.hwndOwner = hwndDlg; ofn.Flags = OFN_NOREADONLYRETURN | OFN_CREATEPROMPT | OFN_OVERWRITEPROMPT; - ofn.lpstrFilter = L"INI\0*.ini\0Text\0*.TXT\0All\0*.*\0"; + ofn.lpstrFilter = _T("INI\0*.ini\0Text\0*.TXT\0All\0*.*\0"); ofn.nFilterIndex = 1; - ofn.lpstrDefExt = L"ini"; + ofn.lpstrDefExt = _T("ini"); if(GetSaveFileName(&ofn) == TRUE) { if(!ExportSettings(hwndDlg, ofn.lpstrFile, font_id_list_w, colour_id_list_w)) - MessageBox(hwndDlg, L"Error writing file", L"Error", MB_ICONWARNING | MB_OK); + MessageBox(hwndDlg, _T("Error writing file"), _T("Error"), MB_ICONWARNING | MB_OK); } return TRUE; @@ -578,7 +578,7 @@ static BOOL CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP // it->second.style & DBFONTF_ITALIC ? 1 : 0, 0, 0, it->second.charset, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_DONTCARE, it->second.szFace); hdc = GetDC(hwndDlg); hOldFont = (HFONT)SelectObject(hdc, hFont); - GetTextExtentPoint32(hdc, L"_W", 2, &size); + GetTextExtentPoint32(hdc, _T("_W"), 2, &size); ReleaseDC(hwndDlg, hdc); SelectObject(hdc, hOldFont); DeleteObject(hFont); -- cgit v1.2.3