[cmake-commits] hoffman committed PropertyList.cpp 1.29 1.29.6.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/MFCDialog
In directory public:/mounts/ram/cvs-serv31017/Source/MFCDialog

Modified Files:
      Tag: CMake-2-4
	PropertyList.cpp 
Log Message:
ENH: merge changes from the main tree to the 2.4 branch


Index: PropertyList.cpp
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/MFCDialog/PropertyList.cpp,v
retrieving revision 1.29
retrieving revision 1.29.6.1
diff -u -d -r1.29 -r1.29.6.1
--- PropertyList.cpp	13 Jan 2005 17:26:13 -0000	1.29
+++ PropertyList.cpp	13 Oct 2006 14:52:07 -0000	1.29.6.1
@@ -332,7 +332,31 @@
     }
         
   else
+    {
     DisplayButton(rect);
+    m_nLastBox = 1;
+    m_prevSel = m_curSel;
+    rect.bottom -= 3;
+    rect.right -= 25;
+    if (m_editBox)
+      {
+      m_editBox.MoveWindow(rect);
+      }
+    else
+      { 
+      m_editBox.Create(ES_LEFT | ES_AUTOHSCROLL | WS_VISIBLE 
+                       | WS_CHILD | WS_BORDER,
+                       rect,this,IDC_PROPEDITBOX);
+      m_editBox.SetFont(&m_SSerif8Font);
+      }
+    
+    lBoxSelText = pItem->m_curValue;
+    
+    m_editBox.ShowWindow(SW_SHOW);
+    m_editBox.SetFocus();
+    //set the text in the edit box to the property's current value
+    m_editBox.SetWindowText(lBoxSelText);
+    }
 }
 
 void CPropertyList::DisplayButton(CRect region)