Skip to content

L
libSDL
Commit a55c55c3 authored by Daniel Wyatt's avatar Daniel Wyatt
Browse files
Options

Added imm.h include, will be needed on MinGW. 

Changed comment to c-style and removed some end-of-line whitespace.
parent eaca5187
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
src/video/win32/SDL_win32video.h
View file @ a55c55c3
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <windows.h> #include <windows.h>
#include <msctf.h> #include <msctf.h>
#include <imm.h>
#if SDL_VIDEO_RENDER_D3D #if SDL_VIDEO_RENDER_D3D
//#include <d3d9.h> //#include <d3d9.h>
...@@ -81,29 +82,29 @@ typedef struct ...@@ -81,29 +82,29 @@ typedef struct
void *data; void *data;
} TSFSink; } TSFSink;
// Definition from Win98DDK version of IMM.H /* Definition from Win98DDK version of IMM.H */
typedef struct tagINPUTCONTEXT2 { typedef struct tagINPUTCONTEXT2 {
HWND hWnd; HWND hWnd;
BOOL fOpen; BOOL fOpen;
POINT ptStatusWndPos; POINT ptStatusWndPos;
POINT ptSoftKbdPos; POINT ptSoftKbdPos;
DWORD fdwConversion; DWORD fdwConversion;
DWORD fdwSentence; DWORD fdwSentence;
union { union {
LOGFONTA A; LOGFONTA A;
LOGFONTW W; LOGFONTW W;
} lfFont; } lfFont;
COMPOSITIONFORM cfCompForm; COMPOSITIONFORM cfCompForm;
CANDIDATEFORM cfCandForm[4]; CANDIDATEFORM cfCandForm[4];
HIMCC hCompStr; HIMCC hCompStr;
HIMCC hCandInfo; HIMCC hCandInfo;
HIMCC hGuideLine; HIMCC hGuideLine;
HIMCC hPrivate; HIMCC hPrivate;
DWORD dwNumMsgBuf; DWORD dwNumMsgBuf;
HIMCC hMsgBuf; HIMCC hMsgBuf;
DWORD fdwInit; DWORD fdwInit;
DWORD dwReserve[3]; DWORD dwReserve[3];
} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
/* Private display data */ /* Private display data */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment