[commit] r1239 - trunk/GME/PartBrowser

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Thu Mar 31 15:16:42 CDT 2011


Author: ksmyth
Date: Thu Mar 31 15:16:42 2011
New Revision: 1239

Log:
Compile under UNICODE

Modified:
   trunk/GME/PartBrowser/PartBrowser.vcxproj
   trunk/GME/PartBrowser/PartBrowserPane.cpp
   trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp

Modified: trunk/GME/PartBrowser/PartBrowser.vcxproj
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.vcxproj	Thu Mar 31 15:16:07 2011	(r1238)
+++ trunk/GME/PartBrowser/PartBrowser.vcxproj	Thu Mar 31 15:16:42 2011	(r1239)
@@ -23,13 +23,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -184,4 +184,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file

Modified: trunk/GME/PartBrowser/PartBrowserPane.cpp
==============================================================================
--- trunk/GME/PartBrowser/PartBrowserPane.cpp	Thu Mar 31 15:16:07 2011	(r1238)
+++ trunk/GME/PartBrowser/PartBrowserPane.cpp	Thu Mar 31 15:16:42 2011	(r1239)
@@ -37,7 +37,7 @@
 	backgroundColor = ::GetSysColor(COLOR_APPWORKSPACE);
 	txtMetricFont.CreateFont(fontSizes[GME_NAME_FONT], 0, 0, 0, FW_NORMAL, false, 0, 0, ANSI_CHARSET,
 							 OUT_DEVICE_PRECIS, CLIP_DEFAULT_PRECIS,
-							 PROOF_QUALITY, FF_SWISS, "Arial");
+							 PROOF_QUALITY, FF_SWISS, _T("Arial"));
 }
 
 CPartBrowserPane::~CPartBrowserPane()
@@ -318,7 +318,7 @@
 void CPartBrowserPane::SetMetaModel(CComPtr<IMgaMetaModel> meta)
 {
 	CComPtr<IMgaRegistrar> registrar;
-	COMTHROW(registrar.CoCreateInstance(CComBSTR("Mga.MgaRegistrar")));
+	COMTHROW(registrar.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar")));
 	ASSERT(registrar != NULL);
 	edgesmoothmode_enum edgeSmoothMode;
 	COMTHROW(registrar->get_EdgeSmoothMode(REGACCESS_USER, &edgeSmoothMode));

Modified: trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp
==============================================================================
--- trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp	Thu Mar 31 15:16:07 2011	(r1238)
+++ trunk/GME/PartBrowser/PartBrowserPaneFrame.cpp	Thu Mar 31 15:16:42 2011	(r1239)
@@ -125,7 +125,7 @@
 	
 	RECT r;
 	GetClientRect(&r);
-	BOOL success = pane.Create(NULL, "PartsPane", WS_CHILD | WS_VISIBLE | WS_BORDER, r, this, IDD_PARTBROWSER_PANE);
+	BOOL success = pane.Create(NULL, _T("PartsPane"), WS_CHILD | WS_VISIBLE | WS_BORDER, r, this, IDD_PARTBROWSER_PANE);
 	pane.ModifyStyleEx(0, WS_EX_CLIENTEDGE);
 
 	return TRUE;	// return TRUE unless you set the focus to a control


More information about the gme-commit mailing list