Mercurial > flash_v2
comparison host/tools/pkgadmin/win32/PkgAdminDlg.cpp @ 147:d397fc472bcf
Merge from eCos master repository on 2001-01-05-06:43:02-GMT
| author | jlarmour |
|---|---|
| date | Fri, 05 Jan 2001 17:12:36 +0000 |
| parents | 435cced73e2f |
| children |
comparison
equal
deleted
inserted
replaced
| 146:bd918119cf0b | 147:d397fc472bcf |
|---|---|
| 257 HCURSOR CPkgAdminDlg::OnQueryDragIcon() | 257 HCURSOR CPkgAdminDlg::OnQueryDragIcon() |
| 258 { | 258 { |
| 259 return (HCURSOR) m_hIcon; | 259 return (HCURSOR) m_hIcon; |
| 260 } | 260 } |
| 261 | 261 |
| 262 // Trivial handlers; otherwise CdlPackagesDatabaseBody::make asserts. | |
| 263 void CdlErrorHandler (std::string message) | |
| 264 { | |
| 265 }; | |
| 266 | |
| 267 void CdlWarningHandler (std::string message) | |
| 268 { | |
| 269 }; | |
| 270 | |
| 271 | |
| 262 bool CPkgAdminDlg::PopulatePackageTree(LPCTSTR pszPackagesPath) | 272 bool CPkgAdminDlg::PopulatePackageTree(LPCTSTR pszPackagesPath) |
| 263 { | 273 { |
| 264 // delete any existing CDL database | 274 // delete any existing CDL database |
| 265 | 275 |
| 266 if (m_CdlPkgData) | 276 if (m_CdlPkgData) |
| 271 | 281 |
| 272 // load the package database | 282 // load the package database |
| 273 | 283 |
| 274 try | 284 try |
| 275 { | 285 { |
| 286 // Cdl asserts unless the handlers are present. | |
| 287 #if 1 | |
| 288 m_CdlPkgData = CdlPackagesDatabaseBody::make (UnicodeToStdStr (pszPackagesPath), &CdlErrorHandler, &CdlWarningHandler); | |
| 289 #else | |
| 276 m_CdlPkgData = CdlPackagesDatabaseBody::make (UnicodeToStdStr (pszPackagesPath)); | 290 m_CdlPkgData = CdlPackagesDatabaseBody::make (UnicodeToStdStr (pszPackagesPath)); |
| 291 #endif | |
| 277 } | 292 } |
| 278 catch (CdlStringException exception) | 293 catch (CdlStringException exception) |
| 279 { | 294 { |
| 280 CString strMessage; | 295 CString strMessage; |
| 281 strMessage.Format (_T("Error loading database:\n\n%s"), CString (exception.get_message ().c_str ())); | 296 strMessage.Format (_T("Error loading database:\n\n%s"), CString (exception.get_message ().c_str ())); |
