[commit] r1482 - trunk/GME/Gme
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Mon Aug 29 14:54:01 CDT 2011
Author: ksmyth
Date: Mon Aug 29 14:54:01 2011
New Revision: 1482
Log:
Dont warn so much about not being able to create a decorator
Modified:
trunk/GME/Gme/GMEView.h
trunk/GME/Gme/GUIObject.cpp
Modified: trunk/GME/Gme/GMEView.h
==============================================================================
--- trunk/GME/Gme/GMEView.h Wed Aug 24 09:10:22 2011 (r1481)
+++ trunk/GME/Gme/GMEView.h Mon Aug 29 14:54:01 2011 (r1482)
@@ -141,6 +141,7 @@
CPoint dragPoint;
CPoint dragOffset;
CPoint contextMenuLocation;
+ std::set<CString> uncreatableDecorators;
CComPtr<IMgaTerritory> terry;
CComPtr<IMgaModel> currentModel;
Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp Wed Aug 24 09:10:22 2011 (r1481)
+++ trunk/GME/Gme/GUIObject.cpp Mon Aug 29 14:54:01 2011 (r1482)
@@ -1304,7 +1304,11 @@
hres = decor.CoCreateInstance(PutInBstr(progId));
}
if (FAILED(hres)) { // fall back to default decorator
- CMainFrame::theInstance->m_console.Message(_T("Cannot create ") + progId + _T(" decorator! Trying default (") + GME_DEFAULT_DECORATOR + _T(") decorator."), 3);
+ if (this->view->uncreatableDecorators.find(progId) == this->view->uncreatableDecorators.end())
+ {
+ CMainFrame::theInstance->m_console.Message(_T("Cannot create ") + progId + _T(" decorator! Trying default (") + GME_DEFAULT_DECORATOR + _T(") decorator."), 3);
+ this->view->uncreatableDecorators.insert(progId);
+ }
progId = GME_DEFAULT_DECORATOR;
COMTHROW(newDecor.CoCreateInstance(PutInBstr(progId)));
}
More information about the gme-commit
mailing list