[commit] r2456 - trunk/SDK/DecoratorLib

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Mar  4 13:23:55 2014
New Revision: 2456

Log:
Fix 'Simplify confusing preferences.'

Modified:
   trunk/SDK/DecoratorLib/LabelPart.cpp
   trunk/SDK/DecoratorLib/TextPart.h

Modified: trunk/SDK/DecoratorLib/LabelPart.cpp
==============================================================================
--- trunk/SDK/DecoratorLib/LabelPart.cpp	Tue Mar  4 10:24:14 2014	(r2455)
+++ trunk/SDK/DecoratorLib/LabelPart.cpp	Tue Mar  4 13:23:55 2014	(r2456)
@@ -132,7 +132,6 @@
 void LabelPart::InitializeEx(CComPtr<IMgaProject>& pProject, CComPtr<IMgaMetaPart>& pPart, CComPtr<IMgaFCO>& pFCO,
 							HWND parentWnd, PreferenceMap& preferences)
 {
-	preferences[DecoratorSDK::PREF_TEXTOVERRIDE] = DecoratorSDK::PreferenceVariant(true);
 	TextPart::InitializeEx(pProject, pPart, pFCO, parentWnd, preferences);
 	PreferenceMap::iterator it = preferences.find(PREF_LABEL);
 	if (it != preferences.end())

Modified: trunk/SDK/DecoratorLib/TextPart.h
==============================================================================
--- trunk/SDK/DecoratorLib/TextPart.h	Tue Mar  4 10:24:14 2014	(r2455)
+++ trunk/SDK/DecoratorLib/TextPart.h	Tue Mar  4 13:23:55 2014	(r2456)
@@ -65,6 +65,7 @@
 
 	virtual long	GetLongest					(void) const;
 
+	virtual void	SetText						(const CString& text) { m_strText = text; };
 	virtual CPoint	GetTextPosition				(CDC* pDC, Gdiplus::Graphics* gdip) const = 0;
 	virtual void	SetTextRelYPosition			(long relYPosition) = 0;
 	virtual CRect	GetTextLocation				(CDC* pDC, Gdiplus::Graphics* gdip) const = 0;