[ShareDaemon-CVS] ui-wx/src Images.cpp,1.54,1.55

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27604

Modified Files:
	Images.cpp 
Log Message:
Fixes font colour issues in toolbar buttons when using radical colour schemes on win32.

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Images.cpp	31 Dec 2003 10:24:26 -0000	1.54
+++ Images.cpp	31 Dec 2003 10:52:55 -0000	1.55
@@ -186,13 +186,7 @@
 			GetImage(image),
 			(tmp_new.GetWidth()-32)/2, 2, true
 		);
-#ifdef __WXMSW__                    /* Well, this gives correct colour on MSW */
-		mdc.SetTextForeground(
-			wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)
-		);
-#else      /* However, it doesn't work anywhere else, so use 0, 0, 0 instead */
-		mdc.SetTextForeground(wxColour(0, 0, 0));
-#endif
+
 		mdc.GetTextExtent(name, &x, &y);
 		mdc.DrawText(name, (tmp_new.GetWidth()-x)/2, 36);
 #ifndef __WXMSW__                              /* Use wxMask for transparency */