Mercurial > sdl-ios-xcode

comparison src/video/win32/SDL_win32video.h @ 4892:9e1f6d3fb870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added imm.h include, will be needed on MinGW. Changed comment to c-style and removed some end-of-line whitespace.
author Daniel Wyatt <Daniel.Wyatt@gmail.com>
date Sun, 19 Sep 2010 14:41:18 -0400
parents d6adaafcfb10
children b2e434e0553b
comparison
equal deleted inserted replaced
4890:443771460df9 4892:9e1f6d3fb870
35 #define WINVER 0x500 /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */ 35 #define WINVER 0x500 /* Need 0x410 for AlphaBlend() and 0x500 for EnumDisplayDevices() */
36 36
37 #include <windows.h> 37 #include <windows.h>
38 38
39 #include <msctf.h> 39 #include <msctf.h>
40 #include <imm.h>
40 41
41 #if SDL_VIDEO_RENDER_D3D 42 #if SDL_VIDEO_RENDER_D3D
42 //#include <d3d9.h> 43 //#include <d3d9.h>
43 #define D3D_DEBUG_INFO 44 #define D3D_DEBUG_INFO
44 #include "d3d9.h" 45 #include "d3d9.h"
79 void **lpVtbl; 80 void **lpVtbl;
80 int refcount; 81 int refcount;
81 void *data; 82 void *data;
82 } TSFSink; 83 } TSFSink;
83 84
84 // Definition from Win98DDK version of IMM.H 85 /* Definition from Win98DDK version of IMM.H */
85 typedef struct tagINPUTCONTEXT2 { 86 typedef struct tagINPUTCONTEXT2 {
86 HWND hWnd; 87 HWND hWnd;
87 BOOL fOpen; 88 BOOL fOpen;
88 POINT ptStatusWndPos; 89 POINT ptStatusWndPos;
89 POINT ptSoftKbdPos; 90 POINT ptSoftKbdPos;
90 DWORD fdwConversion; 91 DWORD fdwConversion;
91 DWORD fdwSentence; 92 DWORD fdwSentence;
92 union { 93 union {
93 LOGFONTA A; 94 LOGFONTA A;
94 LOGFONTW W; 95 LOGFONTW W;
95 } lfFont; 96 } lfFont;
96 COMPOSITIONFORM cfCompForm; 97 COMPOSITIONFORM cfCompForm;
97 CANDIDATEFORM cfCandForm[4]; 98 CANDIDATEFORM cfCandForm[4];
98 HIMCC hCompStr; 99 HIMCC hCompStr;
99 HIMCC hCandInfo; 100 HIMCC hCandInfo;
100 HIMCC hGuideLine; 101 HIMCC hGuideLine;
101 HIMCC hPrivate; 102 HIMCC hPrivate;
102 DWORD dwNumMsgBuf; 103 DWORD dwNumMsgBuf;
103 HIMCC hMsgBuf; 104 HIMCC hMsgBuf;
104 DWORD fdwInit; 105 DWORD fdwInit;
105 DWORD dwReserve[3]; 106 DWORD dwReserve[3];
106 } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; 107 } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
107 108
108 /* Private display data */ 109 /* Private display data */
109 110
110 typedef struct SDL_VideoData 111 typedef struct SDL_VideoData
111 { 112 {