[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1511
Date       : Mon Jul 24 17:10:46 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/opfeathr.cpp

And forgot this one


Diff:
Index: Trunk/XaraLX/Kernel/opfeathr.cpp
===================================================================
--- Trunk/XaraLX/Kernel/opfeathr.cpp	(revision 1510)
+++ Trunk/XaraLX/Kernel/opfeathr.cpp	(revision 1511)
@@ -450,10 +450,8 @@
 			UINT32		GadgetID = GadgetItem->gidGadgetID;
 			DialogOp*	pDlg	 = GadgetItem->pDialogOp;
 
-			/* Remove until custom slider implemented
 			if (Str != NULL)
-				pDlg->SetStringGadgetValue(GadgetID, Str, FALSE, -1);
-			*/
+				pDlg->SetStringGadgetValue(GadgetID, *Str, FALSE, -1);
 
 			// set the position of a cc_Slider or the slider component of a cc_CustomEdit...
 TRACEUSER("amb", _T("UpdateAllFeatherContrls: Set slider to %d in [%d .. %d]"), InverseSliderVal, MinSlider, MaxSlider);
@@ -582,8 +580,6 @@
 
 void ChangeFeatherSizeSliderOpDesc::OnSelectionChange(OpDescControlMsg* SelChangedMsg, List* GadgetList)
 {
-PORTNOTE("feather", "Feather Slider OnSelectionChange disabled since it doesn't have an edit field at the moment and gets upset by wxEVT_SCROLL messages")
-#if !defined(EXCLUDE_FROM_XARALX)
     DialogOp* pDlg = SelChangedMsg->pDlgOp;
     CGadgetID SetGadgetID = SelChangedMsg->SetGadgetID;
 
@@ -610,7 +606,6 @@
 
 	if (!bSuccess)
 		SetFeatherSizeForCurrentSel();
-#endif
 }
 
 /********************************************************************************************


Xara