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
author: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> 2006-11-23 03:20:39 +0000
committer: sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10> 2006-11-23 03:20:39 +0000
commit: 96101e2721d4cb277bf0b9d02f077dc2dd9087d8 (patch)
tree: 100b87f40e0d6630fe5fb9fa1f587a2c53253deb
parent: cc8cbdb8068337547ce003a6de1998820b6f9dc0 (diff)
8 files changed, 16 insertions, 484 deletions
diff --git a/font_service/FontService.cpp b/font_service/FontService.cpp
index 05b8aa9..a8a8b89 100644
--- a/font_service/FontService.cpp
+++ b/font_service/FontService.cpp
@@ -10,8 +10,12 @@
 
 PLUGININFO pluginInfo={
 		sizeof(PLUGININFO),
+#ifndef _UNICODE
+		"FontService (ANSI)",
+#else
 		"FontService",
-	    PLUGIN_MAKE_VERSION(0, 1, 4, 4),
+#endif
+	    PLUGIN_MAKE_VERSION(0, 2, 0, 0),
 		"Provides a UI for font settings, and services to plugins for font control.",
 		"S. Ellis",
 		"mail@scottellis.com.au",
@@ -44,12 +48,12 @@ extern "C" BOOL APIENTRY DllMain( HANDLE hModule,
 
 
 int ModulesLoaded(WPARAM wParam, LPARAM lParam) {
-	if(!GetModuleHandle(L"CLIST_MODERN"))
+	if(!GetModuleHandle(_T("CLIST_MODERN")))
 		RegisterCListFonts();
 
-	if(GetModuleHandle(L"SRMM"))
+	if(GetModuleHandle(_T("SRMM")))
 		RegisterSRMMFonts();
-	if(GetModuleHandle(L"CHAT"))
+	if(GetModuleHandle(_T("CHAT")))
 		RegisterChatFonts();
 
 	return 0;
diff --git a/font_service/FontService.mdsp b/font_service/FontService.mdsp
index 5a746f6..472aa47 100644
--- a/font_service/FontService.mdsp
+++ b/font_service/FontService.mdsp
@@ -98,7 +98,7 @@ extraResourceOptions=
 1=resource.rc
 [Other]
 [History]
-collection.h,3038
-FontService.h,682
 options.cpp,986
+FontService.h,682
+collection.h,3038
 FontService.cpp,353
diff --git a/font_service/FontService.plg b/font_service/FontService.plg
deleted file mode 100644
index 38f6869..0000000
--- a/font_service/FontService.plg
+++ /dev/null
@@ -1,68 +0,0 @@
-<html>
-<body>
-<pre>
-<h1>Build Log</h1>
-<h3>
---------------------Configuration: FontService - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP95.tmp" with contents
-[
-/nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FONTSERVICE_EXPORTS" /Fp"Release/FontService.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\FontService\FontService.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP95.tmp" 
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP96.tmp" with contents
-[
-comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/FontService.pdb" /machine:I386 /out:"../../bin/release/plugins/FontService.dll" /implib:"Release/FontService.lib" 
-".\Release\FontService.obj"
-".\Release\module_fonts.obj"
-".\Release\options.obj"
-".\Release\services.obj"
-".\Release\StdAfx.obj"
-".\Release\resource.res"
-]
-Creating command line "link.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP96.tmp"
-<h3>Output Window</h3>
-Compiling...
-FontService.cpp
-Linking...
-   Creating library Release/FontService.lib and object Release/FontService.exp
-
-
-
-<h3>Results</h3>
-FontService.dll - 0 error(s), 0 warning(s)
-<h3>
---------------------Configuration: FontService - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP9A.tmp" with contents
-[
-/nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FONTSERVICE_EXPORTS" /Fp"Debug/FontService.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\Documents and Settings\sje\My Documents\MyProjects\miranda\plugins\FontService\FontService.cpp"
-]
-Creating command line "cl.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP9A.tmp" 
-Creating temporary file "C:\DOCUME~1\sje\LOCALS~1\Temp\RSP9B.tmp" with contents
-[
-comctl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x22030000" /dll /incremental:yes /pdb:"Debug/FontService.pdb" /debug /machine:I386 /out:"../../bin/debug/plugins/FontService.dll" /implib:"Debug/FontService.lib" /pdbtype:sept 
-".\Debug\FontService.obj"
-".\Debug\module_fonts.obj"
-".\Debug\options.obj"
-".\Debug\services.obj"
-".\Debug\StdAfx.obj"
-".\Debug\resource.res"
-]
-Creating command line "link.exe @C:\DOCUME~1\sje\LOCALS~1\Temp\RSP9B.tmp"
-<h3>Output Window</h3>
-Compiling...
-FontService.cpp
-Linking...
-
-
-
-<h3>Results</h3>
-FontService.dll - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
diff --git a/font_service/FontService_8.vcproj b/font_service/FontService_8.vcproj
index 723e5f5..16362dc 100644
--- a/font_service/FontService_8.vcproj
+++ b/font_service/FontService_8.vcproj
@@ -318,14 +318,6 @@
 				>
 			</File>
 			<File
-				RelativePath="m_fontservice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\m_fontservicew.h"
-				>
-			</File>
-			<File
 				RelativePath="module_fonts.h"
 				>
 			</File>
diff --git a/font_service/Makefile b/font_service/Makefile
deleted file mode 100644
index 53b136d..0000000
--- a/font_service/Makefile
+++ /dev/null
@@ -1,197 +0,0 @@
-#################################################################
-## This Makefile Exported by MinGW Developer Studio
-## Copyright (c) 2002-2004 by Parinya Thipchart
-#################################################################
-
-ifneq (,$(findstring Release, $(CFG)))
-  override CFG = Release
-else
-  override CFG = Debug
-endif
-
-PROJECT = FontService
-CC = "C:\msys\bin\g++.exe"
-
-WINDRES = "$(COMPILER_BIN)windres.exe"
-ifeq ($(CFG),Debug)
-  OBJ_DIR = Debug
-  OUTPUT_DIR = Debug
-  TARGET = FontService.dll
-  C_INCLUDE_DIRS = -I"../../../../../../../msys/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" 
-  C_PREPROC = -DUNICODE -D_UNICODE -DFONTSERVICE_EXPORTS -DMICROSOFT_LAYER_FOR_UNICODE=1 
-  CFLAGS = -pipe  -Wall -g2 -O0 -frtti -fexceptions 
-  RC_INCLUDE_DIRS = 
-  RC_PREPROC = 
-  RCFLAGS = 
-  LIB_DIRS = -L"../../../../../../../msys/lib" -L"../../../../../../../msys/local/lib" -L"../../../../../../../msys/local/lib" 
-  LIBS = -lunicows -lgdi32 
-  LDFLAGS = -pipe -shared -Wl,--output-def,"$(OBJ_DIR)\FontService.def",--out-implib,"$(OBJ_DIR)\libFontService.dll.a" 
-endif
-
-ifeq ($(CFG),Release)
-  OBJ_DIR = Release
-  OUTPUT_DIR = Release
-  TARGET = FontService.dll
-  C_INCLUDE_DIRS = -I"../../../../../../../msys/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" 
-  C_PREPROC = -DUNICODE -D_UNICODE -DFONTSERVICE_EXPORTS -DMICROSOFT_LAYER_FOR_UNICODE=1 
-  CFLAGS = -pipe  -Wall -g0 -O2 -frtti -fexceptions 
-  RC_INCLUDE_DIRS = 
-  RC_PREPROC = 
-  RCFLAGS = 
-  LIB_DIRS = -L"../../../../../../../msys/lib" -L"../../../../../../../msys/local/lib" -L"../../../../../../../msys/local/lib" 
-  LIBS = -lunicows -lgdi32 
-  LDFLAGS = -pipe -shared -Wl,--output-def,"$(OBJ_DIR)\FontService.def",--out-implib,"$(OBJ_DIR)\libFontService.dll.a" -s 
-endif
-
-ifeq ($(OS),Windows_NT)
-  NULL =
-else
-  NULL = nul
-endif
-
-SRC_OBJS = \
-  $(OBJ_DIR)/FontService.o	\
-  $(OBJ_DIR)/StdAfx.o	\
-  $(OBJ_DIR)/module_fonts.o	\
-  $(OBJ_DIR)/options.o	\
-  $(OBJ_DIR)/services.o
-
-RSRC_OBJS = \
-  $(OBJ_DIR)/resource.res
-
-define build_target
-@echo Linking...
-@$(CC) -o "$(OUTPUT_DIR)\$(TARGET)" $(SRC_OBJS) $(RSRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
-endef
-
-define compile_resource
-@echo Compiling $<
-@$(WINDRES) $(RCFLAGS) $(RC_PREPROC) $(RC_INCLUDE_DIRS) -O COFF -i "$<" -o "$@"
-endef
-
-define compile_source
-@echo Compiling $<
-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
-endef
-
-.PHONY: print_header directories
-
-$(TARGET): print_header directories $(RSRC_OBJS) $(SRC_OBJS)
-	$(build_target)
-
-.PHONY: clean cleanall
-
-cleanall:
-	@echo Deleting intermediate files for 'FontService - $(CFG)'
-	-@del $(OBJ_DIR)\*.o
-	-@del $(OBJ_DIR)\*.res
-	-@del "$(OUTPUT_DIR)\$(TARGET)"
-	-@del "$(OBJ_DIR)\$(PROJECT).def"
-	-@del "$(OBJ_DIR)\lib$(PROJECT).dll.a"
-	-@rmdir "$(OUTPUT_DIR)"
-
-clean:
-	@echo Deleting intermediate files for 'FontService - $(CFG)'
-	-@del $(OBJ_DIR)\*.o
-	-@del $(OBJ_DIR)\*.res
-
-print_header:
-	@echo ----------Configuration: FontService - $(CFG)----------
-
-directories:
-	-@if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
-	-@if not exist "$(OBJ_DIR)\$(NULL)" mkdir "$(OBJ_DIR)"
-
-$(OBJ_DIR)/resource.res: resource.rc	\
-resource.h
-	$(compile_resource)
-
-$(OBJ_DIR)/FontService.o: FontService.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-FontService.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h	\
-options.h	\
-module_fonts.h
-	$(compile_source)
-
-$(OBJ_DIR)/StdAfx.o: StdAfx.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h
-	$(compile_source)
-
-$(OBJ_DIR)/module_fonts.o: module_fonts.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-module_fonts.h	\
-m_fontservice.h
-	$(compile_source)
-
-$(OBJ_DIR)/options.o: options.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h
-	$(compile_source)
-
-$(OBJ_DIR)/services.o: services.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h
-	$(compile_source)
-
diff --git a/font_service/Makefile.nodeflib b/font_service/Makefile.nodeflib
deleted file mode 100644
index 209bd5a..0000000
--- a/font_service/Makefile.nodeflib
+++ /dev/null
@@ -1,197 +0,0 @@
-#################################################################
-## This Makefile Exported by MinGW Developer Studio
-## Copyright (c) 2002-2004 by Parinya Thipchart
-#################################################################
-
-ifneq (,$(findstring Release, $(CFG)))
-  override CFG = Release
-else
-  override CFG = Debug
-endif
-
-PROJECT = FontService
-CC = "C:\msys\bin\g++.exe"
-
-WINDRES = "$(COMPILER_BIN)windres.exe"
-ifeq ($(CFG),Debug)
-  OBJ_DIR = Debug
-  OUTPUT_DIR = Debug
-  TARGET = FontService.dll
-  C_INCLUDE_DIRS = -I"../../../../../../../msys/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" 
-  C_PREPROC = -DUNICODE -D_UNICODE -DFONTSERVICE_EXPORTS -DMICROSOFT_LAYER_FOR_UNICODE=1 
-  CFLAGS = -pipe  -Wall -g2 -O0 -frtti -fexceptions 
-  RC_INCLUDE_DIRS = 
-  RC_PREPROC = 
-  RCFLAGS = 
-  LIB_DIRS = -L"../../../../../../../msys/lib" -L"../../../../../../../msys/local/lib" -L"../../../../../../../msys/local/lib" 
-  LIBS = -lunicows -lgdi32 
-  LDFLAGS = -pipe -shared -Wl,--output-def,"$(OBJ_DIR)\FontService.def",--out-implib,"$(OBJ_DIR)\libFontService.dll.a" 
-endif
-
-ifeq ($(CFG),Release)
-  OBJ_DIR = Release
-  OUTPUT_DIR = Release
-  TARGET = FontService.dll
-  C_INCLUDE_DIRS = -I"../../../../../../../msys/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" -I"../../../../../../../msys/local/include" 
-  C_PREPROC = -DUNICODE -D_UNICODE -DFONTSERVICE_EXPORTS -DMICROSOFT_LAYER_FOR_UNICODE=1 
-  CFLAGS = -pipe  -Wall -g0 -O2 -frtti -fexceptions 
-  RC_INCLUDE_DIRS = 
-  RC_PREPROC = 
-  RCFLAGS = 
-  LIB_DIRS = -L"../../../../../../../msys/lib" -L"../../../../../../../msys/local/lib" -L"../../../../../../../msys/local/lib" 
-  LIBS = -lunicows -lgdi32 
-  LDFLAGS = -pipe -shared -Wl,--output-def,"$(OBJ_DIR)\FontService.def",--out-implib,"$(OBJ_DIR)\libFontService.dll.a" -nodefaultlibs -s -L"../../../../../../../msys/lib" -L"../../../../../../../msys/local/lib"
-endif
-
-ifeq ($(OS),Windows_NT)
-  NULL =
-else
-  NULL = nul
-endif
-
-SRC_OBJS = \
-  $(OBJ_DIR)/FontService.o	\
-  $(OBJ_DIR)/StdAfx.o	\
-  $(OBJ_DIR)/module_fonts.o	\
-  $(OBJ_DIR)/options.o	\
-  $(OBJ_DIR)/services.o
-
-RSRC_OBJS = \
-  $(OBJ_DIR)/resource.res
-
-define build_target
-@echo Linking...
-@$(CC) -o "$(OUTPUT_DIR)\$(TARGET)" $(SRC_OBJS) $(RSRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
-endef
-
-define compile_resource
-@echo Compiling $<
-@$(WINDRES) $(RCFLAGS) $(RC_PREPROC) $(RC_INCLUDE_DIRS) -O COFF -i "$<" -o "$@"
-endef
-
-define compile_source
-@echo Compiling $<
-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
-endef
-
-.PHONY: print_header directories
-
-$(TARGET): print_header directories $(RSRC_OBJS) $(SRC_OBJS)
-	$(build_target)
-
-.PHONY: clean cleanall
-
-cleanall:
-	@echo Deleting intermediate files for 'FontService - $(CFG)'
-	-@del $(OBJ_DIR)\*.o
-	-@del $(OBJ_DIR)\*.res
-	-@del "$(OUTPUT_DIR)\$(TARGET)"
-	-@del "$(OBJ_DIR)\$(PROJECT).def"
-	-@del "$(OBJ_DIR)\lib$(PROJECT).dll.a"
-	-@rmdir "$(OUTPUT_DIR)"
-
-clean:
-	@echo Deleting intermediate files for 'FontService - $(CFG)'
-	-@del $(OBJ_DIR)\*.o
-	-@del $(OBJ_DIR)\*.res
-
-print_header:
-	@echo ----------Configuration: FontService - $(CFG)----------
-
-directories:
-	-@if not exist "$(OUTPUT_DIR)\$(NULL)" mkdir "$(OUTPUT_DIR)"
-	-@if not exist "$(OBJ_DIR)\$(NULL)" mkdir "$(OBJ_DIR)"
-
-$(OBJ_DIR)/resource.res: resource.rc	\
-resource.h
-	$(compile_resource)
-
-$(OBJ_DIR)/FontService.o: FontService.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-FontService.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h	\
-options.h	\
-module_fonts.h
-	$(compile_source)
-
-$(OBJ_DIR)/StdAfx.o: StdAfx.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h
-	$(compile_source)
-
-$(OBJ_DIR)/module_fonts.o: module_fonts.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-module_fonts.h	\
-m_fontservice.h
-	$(compile_source)
-
-$(OBJ_DIR)/options.o: options.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h
-	$(compile_source)
-
-$(OBJ_DIR)/services.o: services.cpp	\
-StdAfx.h	\
-resource.h	\
-../../include/win2k.h	\
-../../include/newpluginapi.h	\
-../../include/m_langpack.h	\
-../../include/m_database.h	\
-../../include/m_system.h	\
-../../include/m_options.h	\
-../../include/m_utils.h	\
-../../include/m_clui.h	\
-../../include/m_clc.h	\
-../chat/m_chat.h	\
-services.h	\
-m_fontservice.h	\
-m_fontservicew.h
-	$(compile_source)
-
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);
diff --git a/font_service/services.h b/font_service/services.h
index dbafe16..7a02478 100644
--- a/font_service/services.h
+++ b/font_service/services.h
@@ -14,8 +14,6 @@ int GetColour(WPARAM wParam, LPARAM lParam);
 typedef Pair<FontID, FontSettings> FontIDSettingsPair;
 typedef Pair<ColourID, COLORREF> ColourIDColourPair;
 
-#include "m_fontservicew.h"
-
 typedef Pair<FontIDW, FontSettingsW> FontIDSettingsWPair;
 typedef Pair<ColourIDW, COLORREF> ColourIDColourWPair;
author	sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>	2006-11-23 03:20:39 +0000
committer	sje <sje@4f64403b-2f21-0410-a795-97e2b3489a10>	2006-11-23 03:20:39 +0000
commit	96101e2721d4cb277bf0b9d02f077dc2dd9087d8 (patch)
tree	100b87f40e0d6630fe5fb9fa1f587a2c53253deb
parent	cc8cbdb8068337547ce003a6de1998820b6f9dc0 (diff)