[commit] r1338 - trunk/Tools/AutoLayout
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Jun 1 16:57:25 CDT 2011
Author: ksmyth
Date: Wed Jun 1 16:57:25 2011
New Revision: 1338
Log:
UNICODE
Modified:
trunk/Tools/AutoLayout/AutoLayout.vcxproj
trunk/Tools/AutoLayout/DlgAutoLayout.cpp
trunk/Tools/AutoLayout/GMEGraph.cpp
trunk/Tools/AutoLayout/RawComponent.cpp
Modified: trunk/Tools/AutoLayout/AutoLayout.vcxproj
==============================================================================
--- trunk/Tools/AutoLayout/AutoLayout.vcxproj Wed Jun 1 16:35:47 2011 (r1337)
+++ trunk/Tools/AutoLayout/AutoLayout.vcxproj Wed Jun 1 16:57:25 2011 (r1338)
@@ -18,12 +18,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/Tools/AutoLayout/DlgAutoLayout.cpp
==============================================================================
--- trunk/Tools/AutoLayout/DlgAutoLayout.cpp Wed Jun 1 16:35:47 2011 (r1337)
+++ trunk/Tools/AutoLayout/DlgAutoLayout.cpp Wed Jun 1 16:57:25 2011 (r1338)
@@ -187,7 +187,7 @@
// draw score
dc->SetBkMode( TRANSPARENT );
CString scoreLabel;
- scoreLabel.Format("Fitness = %.6f", m_score );
+ scoreLabel.Format(_T("Fitness = %.6f"), m_score );
dc->TextOut( 10, 10, scoreLabel );
}
@@ -278,7 +278,7 @@
}
catch(...)
{
- AfxMessageBox("An internal error occurred in AutoLayout component. Error code = 1");
+ AfxMessageBox(_T("An internal error occurred in AutoLayout component. Error code = 1"));
CDialog::OnCancel();
}
@@ -295,7 +295,7 @@
void CDlgAutoLayout::OnButtonAbort()
{
- int nRet = IDYES; // ::AfxMessageBox("Are you sure you want to abort the auto-layouting procedure?", MB_YESNO | MB_ICONWARNING);
+ int nRet = IDYES; // ::AfxMessageBox(_T("Are you sure you want to abort the auto-layouting procedure?"), MB_YESNO | MB_ICONWARNING);
if (nRet == IDYES)
m_bAbortionRequested = true;
else
Modified: trunk/Tools/AutoLayout/GMEGraph.cpp
==============================================================================
--- trunk/Tools/AutoLayout/GMEGraph.cpp Wed Jun 1 16:35:47 2011 (r1337)
+++ trunk/Tools/AutoLayout/GMEGraph.cpp Wed Jun 1 16:57:25 2011 (r1338)
@@ -220,16 +220,16 @@
else
{
CComBSTR prefs;
- COMTHROW( e->m_nodeFrom->m_fco->get_RegistryValue( L"autorouterPref", &prefs ) );
+ COMTHROW( e->m_nodeFrom->m_fco->get_RegistryValue( CComBSTR(L"autorouterPref"), &prefs ) );
CString prefs2(prefs);
if( connPrefs.GetLength() > 0 )
prefs2 = connPrefs;
if( prefs2.GetLength() > 0 )
{
- bool N = prefs2.Find("N")!=-1;
- bool E = prefs2.Find("E")!=-1;
- bool S = prefs2.Find("S")!=-1;
- bool W = prefs2.Find("W")!=-1;
+ bool N = prefs2.Find(_T("N"))!=-1;
+ bool E = prefs2.Find(_T("E"))!=-1;
+ bool S = prefs2.Find(_T("S"))!=-1;
+ bool W = prefs2.Find(_T("W"))!=-1;
if( !N && !E && S && !W ) e->cannotStartToNorth = true;
if( !N && !E && !S && W ) e->cannotStartToEast = true;
@@ -248,16 +248,16 @@
else
{
CComBSTR prefs;
- COMTHROW( e->m_nodeTo->m_fco->get_RegistryValue( L"autorouterPref", &prefs ) );
+ COMTHROW( e->m_nodeTo->m_fco->get_RegistryValue( CComBSTR(L"autorouterPref"), &prefs ) );
CString prefs2(prefs);
if( connPrefs.GetLength() > 0 )
prefs2 = connPrefs;
if( prefs2.GetLength() > 0 )
{
- bool N = prefs2.Find("n")!=-1;
- bool E = prefs2.Find("e")!=-1;
- bool S = prefs2.Find("s")!=-1;
- bool W = prefs2.Find("w")!=-1;
+ bool N = prefs2.Find(_T("n"))!=-1;
+ bool E = prefs2.Find(_T("e"))!=-1;
+ bool S = prefs2.Find(_T("s"))!=-1;
+ bool W = prefs2.Find(_T("w"))!=-1;
if( !N && !E && S && !W ) e->cannotEndFromNorth = true;
if( !N && !E && !S && W ) e->cannotEndFromEast = true;
Modified: trunk/Tools/AutoLayout/RawComponent.cpp
==============================================================================
--- trunk/Tools/AutoLayout/RawComponent.cpp Wed Jun 1 16:35:47 2011 (r1337)
+++ trunk/Tools/AutoLayout/RawComponent.cpp Wed Jun 1 16:57:25 2011 (r1338)
@@ -30,7 +30,7 @@
return InvokeEx(gme, focus, selected, parvar);
#else
if(interactive) {
- AfxMessageBox("This component does not support the obsolete invoke mechanism");
+ AfxMessageBox(_T("This component does not support the obsolete invoke mechanism"));
}
return E_MGA_NOT_SUPPORTED;
#endif
@@ -58,7 +58,7 @@
COMTHROW(currentobj->get_ObjType(&objType));
if( objType != OBJTYPE_MODEL )
{
- AfxMessageBox("AutoLayout can only run on models. Open a model and try again!");
+ AfxMessageBox(_T("AutoLayout can only run on models. Open a model and try again!"));
throw 0;
}
@@ -83,7 +83,7 @@
// you only need to implement it if other invokation mechanisms are used
STDMETHODIMP RawComponent::ObjectsInvokeEx( IMgaProject *project, IMgaObject *currentobj, IMgaObjects *selectedobjs, long param) {
if(interactive) {
- AfxMessageBox("Tho ObjectsInvoke method is not implemented");
+ AfxMessageBox(_T("Tho ObjectsInvoke method is not implemented"));
}
return E_MGA_NOT_SUPPORTED;
}
@@ -104,7 +104,7 @@
// these two functions are the main
STDMETHODIMP RawComponent::GlobalEvent(globalevent_enum event) {
if(event == GLOBALEVENT_UNDO) {
- AfxMessageBox("UNDO!!");
+ AfxMessageBox(_T("UNDO!!"));
}
return S_OK;
}
@@ -113,7 +113,7 @@
if(eventmask & OBJEVENT_CREATED) {
CComBSTR objID;
COMTHROW(obj->get_ID(&objID));
- AfxMessageBox( "Object created! ObjID: " + CString(objID));
+ AfxMessageBox( _T("Object created! ObjID: ") + CString(objID));
}
return S_OK;
}
More information about the gme-commit
mailing list