Commit in reactos/subsys/system/explorer on MAIN
taskbar/traynotify.cpp+1-11.68 -> 1.69
utility/shellclasses.cpp+61.32 -> 1.33
       /shellclasses.h+71.39 -> 1.40
+14-1
3 modified files
work around GCC's wide string constant bug when compiling inline functions

reactos/subsys/system/explorer/taskbar
traynotify.cpp 1.68 -> 1.69
diff -u -r1.68 -r1.69
--- traynotify.cpp	21 Nov 2004 10:53:55 -0000	1.68
+++ traynotify.cpp	21 Nov 2004 14:26:13 -0000	1.69
@@ -661,7 +661,7 @@
 	MemCanvas mem_dc;
 	SelectedBitmap bmp(mem_dc, CreateCompatibleBitmap(canvas, NOTIFYICON_SIZE, NOTIFYICON_SIZE));
 	RECT rect = {0, 0, NOTIFYICON_SIZE, NOTIFYICON_SIZE};
-	BLENDFUNCTION blend = {AC_SRC_OVER, 0, 128, 0};
+	BLENDFUNCTION blend = {AC_SRC_OVER, 0, 128, 0};	// 50 % visible
 
 	for(NotifyIconSet::const_iterator it=_sorted_icons.begin(); it!=_sorted_icons.end(); ++it) {
 		if (it->_dwState & NIS_HIDDEN) {

reactos/subsys/system/explorer/utility
shellclasses.cpp 1.32 -> 1.33
diff -u -r1.32 -r1.33
--- shellclasses.cpp	17 May 2004 13:11:06 -0000	1.32
+++ shellclasses.cpp	21 Nov 2004 14:26:14 -0000	1.33
@@ -36,6 +36,12 @@
 #endif
 
 
+ // work around GCC's wide string constant bug
+#ifdef __GNUC__
+const LPCTSTR sCFSTR_SHELLIDLIST = TEXT("Shell IDList Array");
+#endif
+
+
  // helper functions for string copying
 
 LPSTR strcpyn(LPSTR dest, LPCSTR source, size_t count)

reactos/subsys/system/explorer/utility
shellclasses.h 1.39 -> 1.40
diff -u -r1.39 -r1.40
--- shellclasses.h	18 Jun 2004 16:44:59 -0000	1.39
+++ shellclasses.h	21 Nov 2004 14:26:14 -0000	1.40
@@ -45,6 +45,13 @@
 #endif
 #endif
 
+ // work around GCC's wide string constant bug when compiling inline functions
+#ifdef __GNUC__
+extern const LPCTSTR sCFSTR_SHELLIDLIST;
+#undef CFSTR_SHELLIDLIST
+#define	CFSTR_SHELLIDLIST sCFSTR_SHELLIDLIST
+#endif
+
 
  // Exception Handling
 
CVSspam 0.2.8