kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix edit of directories

This commit is contained in:
Bill Hoffman 2001-05-31 15:48:35 -04:00
parent 6b37e97cae
commit 01b980591b
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/MFCDialog/CMakeSetupDialog.cpp
View File

@ -100,10 +100,10 @@ BEGIN_MESSAGE_MAP(CMakeSetupDialog, CDialog)
ON_WM_PAINT() ON_WM_PAINT()
ON_WM_QUERYDRAGICON() ON_WM_QUERYDRAGICON()
ON_BN_CLICKED(IDC_BuildProjects, OnBuildProjects) ON_BN_CLICKED(IDC_BuildProjects, OnBuildProjects)
ON_CBN_EDITCHANGE(IDC_WhereBuild, OnChangeWhereBuild)
ON_BN_CLICKED(IDC_BUTTON2, OnBrowseWhereSource) ON_BN_CLICKED(IDC_BUTTON2, OnBrowseWhereSource)
ON_BN_CLICKED(IDC_BUTTON3, OnBrowseWhereBuild) ON_BN_CLICKED(IDC_BUTTON3, OnBrowseWhereBuild)
ON_CBN_SELENDOK(IDC_WhereBuild, OnSelendokWhereBuild) ON_CBN_EDITCHANGE(IDC_WhereBuild, OnChangeWhereBuild)
ON_CBN_SELCHANGE(IDC_WhereBuild, OnSelendokWhereBuild)
ON_CBN_SELENDOK(IDC_WhereSource, OnSelendokWhereSource) ON_CBN_SELENDOK(IDC_WhereSource, OnSelendokWhereSource)
ON_CBN_EDITCHANGE(IDC_WhereSource, OnChangeWhereSource) ON_CBN_EDITCHANGE(IDC_WhereSource, OnChangeWhereSource)
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
@ -147,7 +147,8 @@ BOOL CMakeSetupDialog::OnInitDialog()
// Set the version number // Set the version number
char tmp[1024]; char tmp[1024];
sprintf(tmp,"Version %s", cmMakefile::GetVersion()); sprintf(tmp,"Version %s", cmMakefile::GetVersion());
SetDlgItemText(IDC_CMAKE_VERSION, tmp); SetDlgItemText(IDC_CMAKE_VERSION, tmp);
this->UpdateData(FALSE);
return TRUE; // return TRUE unless you set the focus to a control return TRUE; // return TRUE unless you set the focus to a control
} }
@ -550,13 +551,12 @@ void CMakeSetupDialog::FillCacheGUIFromCacheManager()
break; break;
} }
} }
this->UpdateData(FALSE);
} }
// copy from the list box to the cache manager // copy from the list box to the cache manager
void CMakeSetupDialog::FillCacheManagerFromCacheGUI() void CMakeSetupDialog::FillCacheManagerFromCacheGUI()
{ {
cmCacheManager::GetInstance()->GetCacheMap(); cmCacheManager::GetInstance()->GetCacheMap();
std::set<CPropertyItem*> items = m_CacheEntriesList.GetItems(); std::set<CPropertyItem*> items = m_CacheEntriesList.GetItems();
for(std::set<CPropertyItem*>::iterator i = items.begin(); for(std::set<CPropertyItem*>::iterator i = items.begin();
i != items.end(); ++i) i != items.end(); ++i)

4
Source/cmake.cxx
View File

@ -171,7 +171,9 @@ void cmake::AddCMakePaths(const std::vector<std::string>& args)
if (!cmSystemTools::FileIsDirectory(modules.c_str())) if (!cmSystemTools::FileIsDirectory(modules.c_str()))
{ {
// couldn't find modules // couldn't find modules
cmSystemTools::Error("Could not find CMAKE_ROOT !!!"); cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n",
"Modules directory not in directory:\n",
modules.c_str());
return; return;
} }
} }