[Cegcc-svn] SF.net SVN: cegcc: [797] trunk/cegcc/src/w32api

[<ped...@us...>]

Revision: 797
          http://svn.sourceforge.net/cegcc/?rev=797&view=rev
Author:   pedroalves
Date:     2006-11-12 12:30:41 -0800 (Sun, 12 Nov 2006)

Log Message:
-----------
    * include/commctrl.h (IMAGELISTDRAWPARAMS): There are no fState,
    Frame or crEffect members in CE version.
    (ImageList_Duplicate, ImageList_SetImageCount, ImageList_Copy,
    ImageList_DrawIndirect): Enable on Windows CE >= 2.

Modified Paths:
--------------
    trunk/cegcc/src/w32api/ChangeLog.ce
    trunk/cegcc/src/w32api/include/commctrl.h

Modified: trunk/cegcc/src/w32api/ChangeLog.ce
===================================================================
--- trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 20:09:43 UTC (rev 796)
+++ trunk/cegcc/src/w32api/ChangeLog.ce	2006-11-12 20:30:41 UTC (rev 797)
@@ -1,7 +1,16 @@
+2006-11-12  Pedro Alves  <ped...@po...>
+
+	* include/commctrl.h (IMAGELISTDRAWPARAMS): There are no fState,
+	Frame or crEffect members in CE version.
+	(ImageList_Duplicate, ImageList_SetImageCount, ImageList_Copy,
+	ImageList_DrawIndirect): Enable on Windows CE >= 2.
+	
 2006-11-12  Kevin O'Connor  <ke...@ko...>
+
 	* include/winuser.h (SPI_GETOEMINFO, SPI_GETPLATFORMTYPE): Define.
 
 2006-11-12  Kevin O'Connor  <ke...@ko...>
+
 	* include/tlhelp32.h (CloseToolhelp32Snapshot): Define.
 	CE's Toolhelp functions/structures although wide, don't take the
 	W suffix. Adapt.

Modified: trunk/cegcc/src/w32api/include/commctrl.h
===================================================================
--- trunk/cegcc/src/w32api/include/commctrl.h	2006-11-12 20:09:43 UTC (rev 796)
+++ trunk/cegcc/src/w32api/include/commctrl.h	2006-11-12 20:30:41 UTC (rev 797)
@@ -2854,7 +2854,7 @@
 typedef REBARBANDINFOW const *LPCREBARBANDINFOW;
 #define REBARBANDINFOA_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOA,wID)
 #define REBARBANDINFOW_V3_SIZE CCSIZEOF_STRUCT(REBARBANDINFOW, wID)
-#if (_WIN32_IE >= 0x0300)
+#if (_WIN32_IE >= 0x0300) || (_WIN32_WCE >= 0x0200)
 typedef struct tagIMAGELISTDRAWPARAMS {
 	DWORD cbSize;
 	HIMAGELIST himl;
@@ -2870,13 +2870,13 @@
 	COLORREF rgbFg;
 	UINT fStyle;
 	DWORD dwRop;
-#if (_WIN32_WINNT >= 0x0501)
+#if (_WIN32_WINNT >= 0x0501) && !defined (_WIN32_WCE)
 	DWORD fState;
 	DWORD Frame;
 	COLORREF crEffect;
 #endif
 } IMAGELISTDRAWPARAMS,*LPIMAGELISTDRAWPARAMS;
-#endif /* (_WIN32_IE >= 0x0300) */
+#endif /* (_WIN32_IE >= 0x0300) || (_WIN32_WCE >= 0x0200) */
 #if (_WIN32_IE >= 0x0400)
 typedef struct tagNMREBARCHILDSIZE {
 	NMHDR hdr;
@@ -3076,7 +3076,7 @@
 HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
 BOOL WINAPI ImageList_Write(HIMAGELIST,LPSTREAM);
 #endif
-#if (_WIN32_IE >= 0x0400)
+#if (_WIN32_IE >= 0x0400) || (_WIN32_WCE >= 0x0200)
 HIMAGELIST WINAPI ImageList_Duplicate(HIMAGELIST himl);
 #endif
 void WINAPI InitCommonControls(void);
@@ -3303,9 +3303,13 @@
 #define ListView_SetIconSpacing(w,x,y) (DWORD)SNDMSG((w),LVM_SETICONSPACING,0,MAKELONG(x,y))
 #define ListView_SubItemHitTest(w,p) (INT)SNDMSG((w),LVM_SUBITEMHITTEST,0,(LPARAM)(LPLVHITTESTINFO)(p))
 #define ListView_SetItemCountEx(w,i,f) (void)SNDMSG((w),LVM_SETITEMCOUNT,(WPARAM)(i),(LPARAM)(f))
+#endif
+#if (_WIN32_IE >= 0x0300) || (_WIN32_WCE >= 0x200)
 WINBOOL WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
 WINBOOL WINAPI ImageList_Copy(HIMAGELIST,int,HIMAGELIST,int,UINT);
 WINBOOL WINAPI ImageList_DrawIndirect(IMAGELISTDRAWPARAMS*);
+#endif
+#if (_WIN32_IE >= 0x0300)
 #define TabCtrl_SetMinTabWidth(hwnd,x) SNDMSG((hwnd),TCM_SETMINTABWIDTH,0,x)
 #define TabCtrl_DeselectAll(hwnd,fExcludeFocus) SNDMSG((hwnd),TCM_DESELECTALL,fExcludeFocus,0)
 #define TreeView_GetToolTips(w) (HWND)SNDMSG((w),TVM_GETTOOLTIPS,0,0)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.