[ShareDaemon-CVS] ui-wx/src Images.cpp,1.37,1.38

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

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

Modified Files:
	Images.cpp 
Log Message:
Fixes one endless loop on wxGTK2

Index: Images.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/Images.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- Images.cpp	21 Dec 2003 04:25:18 -0000	1.37
+++ Images.cpp	21 Dec 2003 05:01:42 -0000	1.38
@@ -321,19 +321,19 @@
 	mdc.SelectObject(tmp_new);
 
 	mdc.SetTextForeground(wxColour(10, 10, 10));
-	#ifdef __WXMAC__
+#ifdef __WXMAC__
 		mdc.SetFont(wxFont(10, wxDEFAULT, wxNORMAL, wxNORMAL));
-	#else
+#else
 		mdc.SetFont(wxFont(10, wxDECORATIVE, wxNORMAL, wxBOLD));
-	#endif
+#endif
 
 	mdc.BeginDrawing();
-		#ifdef __WXMSW__     /* This gives transparent image on wxMSW */
+#ifdef __WXMSW__                     /* This gives transparent image on wxMSW */
 			mdc.SetPen(*wxTRANSPARENT_PEN);
 			mdc.SetBrush(wxBrush(*wxLIGHT_GREY, wxSOLID));
-		#else         /* Elsewhere, it will be done with wxMask later */
+#else                         /* Elsewhere, it will be done with wxMask later */
 			mdc.SetBrush(wxBrush(wxColour(0, 0, 0), wxSOLID));
-		#endif
+#endif
 		mdc.DrawRectangle(
 			0, 0, tmp_new.GetWidth(), tmp_new.GetHeight()
 		);
@@ -344,11 +344,11 @@
 		mdc.SetTextForeground(wxColour(1,1,1));
 		mdc.GetTextExtent(name, &x, &y);
 		mdc.DrawText(name, (tmp_new.GetWidth()-x)/2, 36);
-		#ifndef __WXMSW__              /* Use wxMask for transparency */
+#if !defined(__WXMSW__) && !defined(__GTK2__)  /* Use wxMask for transparency */
 			wxMask *tmp_mask;
 			tmp_mask = new wxMask(tmp_new, wxColour(0,0,0));
 			tmp_new.SetMask(tmp_mask);
-		#endif
+#endif
 	mdc.EndDrawing();
 
 	images.DeleteObject(&(GetImage(image)));