* include/imm.h (ImmGetCompositionFont[AW],

	ImmSetCompositionFont[AW]): Add NOGDI guard.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index edbea77..9b72651 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-26  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/imm.h (ImmGetCompositionFont[AW],
+       ImmSetCompositionFont[AW]): Add NOGDI guard.
+
 2002-12-19  Danny Smith  <dannysmith@users.sourceforge.net>
 
        * include/ddk/hidusage.h: Remove unneccessary #pragma pack's.

diff --git a/winsup/w32api/include/imm.h b/winsup/w32api/include/imm.h
index 3602498..6ae9cab 100644 (file)
--- a/winsup/w32api/include/imm.h
+++ b/winsup/w32api/include/imm.h
@@ -344,10 +344,12 @@ BOOL WINAPI ImmGetConversionStatus(HIMC,LPDWORD,PDWORD);
 BOOL WINAPI ImmSetConversionStatus(HIMC,DWORD,DWORD);
 BOOL WINAPI ImmGetOpenStatus(HIMC);
 BOOL WINAPI ImmSetOpenStatus(HIMC,BOOL);
+#ifndef NOGDI
 BOOL WINAPI ImmGetCompositionFontA(HIMC,LPLOGFONTA);
 BOOL WINAPI ImmGetCompositionFontW(HIMC,LPLOGFONTW);
 BOOL WINAPI ImmSetCompositionFontA(HIMC,LPLOGFONTA);
 BOOL WINAPI ImmSetCompositionFontW(HIMC,LPLOGFONTW);
+#endif
 BOOL WINAPI ImmConfigureIMEA(HKL,HWND,DWORD,PVOID);
 BOOL WINAPI ImmConfigureIMEW(HKL,HWND,DWORD,PVOID);
 LRESULT WINAPI ImmEscapeA(HKL,HIMC,UINT,PVOID);
@@ -387,8 +389,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
 #define ImmGetConversionList ImmGetConversionListW
 #define ImmEscape ImmEscapeW
 #define ImmConfigureIME ImmConfigureIMEW
+#ifndef NOGDI
 #define ImmSetCompositionFont ImmSetCompositionFontW
 #define ImmGetCompositionFont ImmGetCompositionFontW
+#endif
 #define ImmGetGuideLine ImmGetGuideLineW
 #define ImmGetCandidateList ImmGetCandidateListW
 #define ImmGetCandidateListCount ImmGetCandidateListCountW
@@ -407,8 +411,10 @@ DWORD WINAPI ImmGetImeMenuItemsW(HIMC,DWORD,DWORD,LPIMEMENUITEMINFOW,LPIMEMENUIT
 #define ImmGetConversionList ImmGetConversionListA
 #define ImmEscape ImmEscapeA
 #define ImmConfigureIME ImmConfigureIMEA
+#ifndef NOGDI
 #define ImmSetCompositionFont ImmSetCompositionFontA
 #define ImmGetCompositionFont ImmGetCompositionFontA
+#endif
 #define ImmGetGuideLine ImmGetGuideLineA
 #define ImmGetCandidateList ImmGetCandidateListA
 #define ImmGetCandidateListCount ImmGetCandidateListCountA