[cmake-commits] hoffman committed ccmake.cxx 1.32 1.32.6.1 cmCursesMainForm.cxx 1.68 1.68.2.1

[cmake-commits at cmake.org]

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

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


Index: cmCursesMainForm.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/cmCursesMainForm.cxx,v
retrieving revision 1.68
retrieving revision 1.68.2.1
diff -u -d -r1.68 -r1.68.2.1
--- cmCursesMainForm.cxx	16 Mar 2006 16:28:13 -0000	1.68
+++ cmCursesMainForm.cxx	13 Oct 2006 14:52:07 -0000	1.68.2.1
@@ -597,14 +597,6 @@
   pos_form_cursor(this->Form);
 }
 
-void cmCursesMainForm::UpdateProgressOld(const char *msg, float prog, void*)
-{
-  if ( prog < 0 )
-    {
-    std::cout << "-- " << msg << std::endl;
-    }
-}
-
 void cmCursesMainForm::UpdateProgress(const char *msg, float prog, void* vp)
 {
   cmCursesMainForm* cm = static_cast<cmCursesMainForm*>(vp);
@@ -810,8 +802,8 @@
         {
         // The user has changed the value.  Mark it as modified.
         it.SetProperty("MODIFIED", true);
-        }
       it.SetValue(fixedNewValue.c_str());
+        }
       }
     }
 }

Index: ccmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CursesDialog/ccmake.cxx,v
retrieving revision 1.32
retrieving revision 1.32.6.1
diff -u -d -r1.32 -r1.32.6.1
--- ccmake.cxx	27 Oct 2004 14:45:45 -0000	1.32
+++ ccmake.cxx	13 Oct 2006 14:52:07 -0000	1.32.6.1
@@ -110,11 +110,14 @@
     {
     cmake hcm;
     std::vector<cmDocumentationEntry> commands;
+    std::vector<cmDocumentationEntry> generators;
     hcm.GetCommandDocumentation(commands);
+    hcm.GetGeneratorDocumentation(generators);
     doc.SetName("ccmake");
     doc.SetNameSection(cmDocumentationName);
     doc.SetUsageSection(cmDocumentationUsage);
     doc.SetDescriptionSection(cmDocumentationDescription);
+    doc.SetGeneratorsSection(&generators[0]);
     doc.SetOptionsSection(cmDocumentationOptions);
     doc.SetCommandsSection(&commands[0]);
     doc.SetSeeAlsoList(cmDocumentationSeeAlso);