Don't declare GDI stuff when NOGDI is defined

[Dimitrie O. Paun]

ChangeLog
    Don't declare GDI stuff when NOGDI is defined.

Index: include/imm.h
===================================================================
RCS file: /var/cvs/wine/include/imm.h,v
retrieving revision 1.14
diff -u -r1.14 imm.h
--- include/imm.h	5 Sep 2003 23:15:44 -0000	1.14
+++ include/imm.h	9 Apr 2004 06:46:37 -0000
@@ -484,9 +484,14 @@
 DWORD    WINAPI ImmGetCandidateListCountW(HIMC, LPDWORD);
 #define  ImmGetCandidateListCount WINELIB_NAME_AW(ImmGetCandidateListCount)
 BOOL   WINAPI ImmGetCandidateWindow(HIMC, DWORD, LPCANDIDATEFORM);
+#ifndef NOGDI
 BOOL   WINAPI ImmGetCompositionFontA(HIMC, LPLOGFONTA);
 BOOL   WINAPI ImmGetCompositionFontW(HIMC, LPLOGFONTW);
 #define  ImmGetCompositionFont WINELIB_NAME_AW(ImmGetCompositionFont)
+BOOL   WINAPI ImmSetCompositionFontA(HIMC, LPLOGFONTA);
+BOOL   WINAPI ImmSetCompositionFontW(HIMC, LPLOGFONTW);
+#define  ImmSetCompositionFont WINELIB_NAME_AW(ImmSetCompositionFont)
+#endif
 LONG     WINAPI ImmGetCompositionStringA(HIMC, DWORD, LPVOID, DWORD);
 LONG     WINAPI ImmGetCompositionStringW(HIMC, DWORD, LPVOID, DWORD);
 #define  ImmGetCompositionString WINELIB_NAME_AW(ImmGetCompositionString)
@@ -526,9 +531,6 @@
 #define  ImmRegisterWord WINELIB_NAME_AW(ImmRegisterWord)
 BOOL   WINAPI ImmReleaseContext(HWND, HIMC);
 BOOL   WINAPI ImmSetCandidateWindow(HIMC, LPCANDIDATEFORM);
-BOOL   WINAPI ImmSetCompositionFontA(HIMC, LPLOGFONTA);
-BOOL   WINAPI ImmSetCompositionFontW(HIMC, LPLOGFONTW);
-#define  ImmSetCompositionFont WINELIB_NAME_AW(ImmSetCompositionFont)
 BOOL   WINAPI ImmSetCompositionStringA(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD);
 BOOL   WINAPI ImmSetCompositionStringW(HIMC, DWORD, LPCVOID, DWORD, LPCVOID, DWORD);
 #define  ImmSetCompositionString WINELIB_NAME_AW(ImmSetCompositionString)


-- 
Dimi.