# HG changeset patch # User Daniel Wyatt # Date 1284921678 14400 # Node ID 9e1f6d3fb870214d485e12f249e68ae3dcd4bebc # Parent 443771460df91f489e7aed14013337c009eb1fd8 Added imm.h include, will be needed on MinGW. Changed comment to c-style and removed some end-of-line whitespace. diff -r 443771460df9 -r 9e1f6d3fb870 src/video/win32/SDL_win32video.h --- a/src/video/win32/SDL_win32video.h Sat Sep 18 18:31:01 2010 -0700 +++ b/src/video/win32/SDL_win32video.h Sun Sep 19 14:41:18 2010 -0400 @@ -37,6 +37,7 @@ #include #include +#include #if SDL_VIDEO_RENDER_D3D //#include @@ -81,29 +82,29 @@ void *data; } TSFSink; -// Definition from Win98DDK version of IMM.H +/* Definition from Win98DDK version of IMM.H */ typedef struct tagINPUTCONTEXT2 { - HWND hWnd; - BOOL fOpen; - POINT ptStatusWndPos; - POINT ptSoftKbdPos; - DWORD fdwConversion; - DWORD fdwSentence; - union { - LOGFONTA A; - LOGFONTW W; - } lfFont; - COMPOSITIONFORM cfCompForm; - CANDIDATEFORM cfCandForm[4]; - HIMCC hCompStr; - HIMCC hCandInfo; - HIMCC hGuideLine; - HIMCC hPrivate; - DWORD dwNumMsgBuf; - HIMCC hMsgBuf; - DWORD fdwInit; - DWORD dwReserve[3]; -} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; + HWND hWnd; + BOOL fOpen; + POINT ptStatusWndPos; + POINT ptSoftKbdPos; + DWORD fdwConversion; + DWORD fdwSentence; + union { + LOGFONTA A; + LOGFONTW W; + } lfFont; + COMPOSITIONFORM cfCompForm; + CANDIDATEFORM cfCandForm[4]; + HIMCC hCompStr; + HIMCC hCandInfo; + HIMCC hGuideLine; + HIMCC hPrivate; + DWORD dwNumMsgBuf; + HIMCC hMsgBuf; + DWORD fdwInit; + DWORD dwReserve[3]; +} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; /* Private display data */