[OMPT-svn-commit] SF.net SVN: modplug:[229] trunk/OpenMPT/mptrack

[<rel...@us...>]

Revision: 229
          http://modplug.svn.sourceforge.net/modplug/?rev=229&view=rev
Author:   relabsoluness
Date:     2008-10-13 15:53:01 +0000 (Mon, 13 Oct 2008)

Log Message:
-----------
(Patch from Jojo)
. Disabled special handling of '&'-character when drawing texts to various components where the special handling should not take place. (http://lpchip.com/modplug/viewtopic.php?t=1962)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
    trunk/OpenMPT/mptrack/Mptrack.cpp

Modified: trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp	2008-10-13 15:19:08 UTC (rev 228)
+++ trunk/OpenMPT/mptrack/ChannelManagerDlg.cpp	2008-10-13 15:53:01 UTC (rev 229)
@@ -596,7 +596,7 @@
 		HGDIOBJ oldfont = ::SelectObject(hdc, CMainFrame::GetGUIFont());
 
 		::SetTextColor(hdc, GetSysColor(bEnable || !bActivate ? COLOR_BTNTEXT : COLOR_GRAYTEXT));
-		::DrawText(hdc, lpszText, -1, &rect, dwFlags | DT_SINGLELINE);
+		::DrawText(hdc, lpszText, -1, &rect, dwFlags | DT_SINGLELINE | DT_NOPREFIX);
 		::SelectObject(hdc, oldfont);
 	}
 }

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2008-10-13 15:19:08 UTC (rev 228)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2008-10-13 15:53:01 UTC (rev 229)
@@ -1951,7 +1951,7 @@
 		::SetTextColor(hdc, GetSysColor((bDisabled) ? COLOR_GRAYTEXT : COLOR_BTNTEXT));
 		::SetBkMode(hdc, TRANSPARENT);
 		HGDIOBJ oldfont = ::SelectObject(hdc, CMainFrame::GetGUIFont());
-		::DrawText(hdc, lpszText, -1, &rect, dwFlags | DT_SINGLELINE);
+		::DrawText(hdc, lpszText, -1, &rect, dwFlags | DT_SINGLELINE | DT_NOPREFIX);
 		::SelectObject(hdc, oldfont);
 	}
 }


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