Mercurial > sdl-ios-xcode

diff 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
line wrap: on
line diff
--- 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 <windows.h>
 
 #include <msctf.h>
+#include <imm.h>
 
 #if SDL_VIDEO_RENDER_D3D
 //#include <d3d9.h>
@@ -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 */