[commit] r1221 - trunk/GME/ObjectInspector
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Mar 30 13:00:58 CDT 2011
Author: ksmyth
Date: Wed Mar 30 13:00:56 2011
New Revision: 1221
Log:
Compile under _UNICODE
Modified:
trunk/GME/ObjectInspector/ (props changed)
trunk/GME/ObjectInspector/Attribute.cpp
trunk/GME/ObjectInspector/ComboBoxSelectDlg.cpp
trunk/GME/ObjectInspector/CompassData.cpp
trunk/GME/ObjectInspector/InPlaceManager.cpp
trunk/GME/ObjectInspector/InspectorDlg.cpp
trunk/GME/ObjectInspector/InspectorList.cpp
trunk/GME/ObjectInspector/InspectorSheet.cpp
trunk/GME/ObjectInspector/ItemData.cpp
trunk/GME/ObjectInspector/ItemData.h
trunk/GME/ObjectInspector/ObjectInspector.vcxproj
trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp
trunk/GME/ObjectInspector/Preference.cpp
trunk/GME/ObjectInspector/Preference.h
trunk/GME/ObjectInspector/Property.cpp
trunk/GME/ObjectInspector/SplitterBar.cpp
Modified: trunk/GME/ObjectInspector/Attribute.cpp
==============================================================================
--- trunk/GME/ObjectInspector/Attribute.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/Attribute.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -147,7 +147,7 @@
{
CListItem ListItem;
- ListItem.strName = "Author";
+ ListItem.strName = _T("Author");
ListItem.dwKeyValue = PROJECT_AUTHOR;
ListItem.bIsDefault = false;
ListItem.bIsDifferentValue = false;
@@ -158,7 +158,7 @@
CString strValue(bstr);
ListItem.Value.SetStringValue(strValue);
- ListItem.DefValue.SetStringValue("");
+ ListItem.DefValue.SetStringValue(_T(""));
ListItemArray.Add(ListItem);
}
@@ -166,7 +166,7 @@
{
CListItem ListItem;
- ListItem.strName = "Version";
+ ListItem.strName = _T("Version");
ListItem.dwKeyValue = PROJECT_VERSION;
ListItem.bIsDefault = false;
ListItem.bIsDifferentValue = false;
@@ -177,7 +177,7 @@
CString strValue(bstr);
ListItem.Value.SetStringValue(strValue);
- ListItem.DefValue.SetStringValue("");
+ ListItem.DefValue.SetStringValue(_T(""));
ListItemArray.Add(ListItem);
}
@@ -185,7 +185,7 @@
{
CListItem ListItem;
- ListItem.strName = "Comment";
+ ListItem.strName = _T("Comment");
ListItem.dwKeyValue = PROJECT_COMMENT;
ListItem.bIsDefault = false;
ListItem.bIsDifferentValue = false;
@@ -200,7 +200,7 @@
ListItem.Value.SetStringValue(strValueArray,6);
// Setting default value
- CString strDefValue = "";
+ CString strDefValue = _T("");
CStringArray strDefValueArray;
strDefValueArray.Add(strDefValue);
ListItem.DefValue.SetStringValue(strDefValueArray,6);
@@ -314,7 +314,7 @@
// Converting to int
CString strLineNum(bstrMultiLinePref);
- int nLineNumMin = atoi(strLineNum);
+ int nLineNumMin = _tstoi(strLineNum);
const int nLineNumMax = 32;
if(nLineNumMin<2) // Single line edit box
@@ -493,7 +493,7 @@
CString strValue;
ListItem.Value.toString(strValue);
- strValue.Replace("\r\n","\n");
+ strValue.Replace(_T("\r\n"), _T("\n"));
CComBSTR bstrValue(strValue);
COMTHROW(ccpCurrFCO->put_StrAttrByName(bstrAttrName,bstrValue));
@@ -536,7 +536,7 @@
{
CString strValue;
ListItem.Value.toString(strValue);
- strValue.Replace("\r\n","\n");
+ strValue.Replace(_T("\r\n"), _T("\n"));
CComBSTR bstrValue(strValue);
switch (ListItem.dwKeyValue) {
Modified: trunk/GME/ObjectInspector/ComboBoxSelectDlg.cpp
==============================================================================
--- trunk/GME/ObjectInspector/ComboBoxSelectDlg.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/ComboBoxSelectDlg.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -85,8 +85,8 @@
m_lstBox.SetFont( m_pFontWnd );
if ( m_pListItem->Value.dataType == ITEMDATA_BOOLEAN ) {
- m_lstBox.AddString("True");
- m_lstBox.AddString("False");
+ m_lstBox.AddString(_T("True"));
+ m_lstBox.AddString(_T("False"));
m_lstBox.SetCurSel( m_pListItem->Value.boolVal );
}
else {
Modified: trunk/GME/ObjectInspector/CompassData.cpp
==============================================================================
--- trunk/GME/ObjectInspector/CompassData.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/CompassData.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -15,13 +15,13 @@
bool CCompassData::ParseCompassValue(CString strValue, UINT &uValue)
{
- char szDelimiters[]=",;\t ";
- char* token=NULL;
+ TCHAR szDelimiters[] = _T(",;\t ");
+ TCHAR* token=NULL;
- char *str=new char[strValue.GetLength()+1];
- strcpy(str,strValue);
+ TCHAR *str = new TCHAR[strValue.GetLength()+1];
+ _tcscpy(str,strValue);
- token=strtok(str,szDelimiters);
+ token=_tcstok(str,szDelimiters);
bool bIsProcessed=false;
UINT uCompassTemp=0;
@@ -31,61 +31,61 @@
bIsProcessed=false;
CString strTemp;
- strTemp="North";
+ strTemp = _T("North");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_NORTH;
bIsProcessed=true;
}
- strTemp="South";
+ strTemp = _T("South");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_SOUTH;
bIsProcessed=true;
}
- strTemp="East";
+ strTemp = _T("East");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_EAST;
bIsProcessed=true;
}
- strTemp="West";
+ strTemp = _T("West");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_WEST;
bIsProcessed=true;
}
- strTemp="Northeast";
+ strTemp = _T("Northeast");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_NORTHEAST;
bIsProcessed=true;
}
- strTemp="Southeast";
+ strTemp = _T("Southeast");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_SOUTHEAST;
bIsProcessed=true;
}
- strTemp="SouthWest";
+ strTemp = _T("SouthWest");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_SOUTHWEST;
bIsProcessed=true;
}
- strTemp="NorthWest";
+ strTemp = _T("NorthWest");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_NORTHWEST;
bIsProcessed=true;
}
- strTemp="Center";
+ strTemp = _T("Center");
if(!strTemp.CompareNoCase(token))
{
uCompassTemp|=CMPS_CENTER;
@@ -94,7 +94,7 @@
if(!bIsProcessed)break;
// Next token
- token=strtok(NULL,szDelimiters);
+ token = _tcstok(NULL,szDelimiters);
}
delete[] str;
@@ -110,47 +110,47 @@
if(uData&CMPS_NORTH)
{
- strRetVal+="North;";
+ strRetVal += _T("North;");
}
if(uData&CMPS_EAST)
{
- strRetVal+="East;";
+ strRetVal += _T("East;");
}
if(uData&CMPS_SOUTH)
{
- strRetVal+="South;";
+ strRetVal += _T("South;");
}
if(uData&CMPS_WEST)
{
- strRetVal+="West;";
+ strRetVal += _T("West;");
}
if(uData&CMPS_NORTHEAST)
{
- strRetVal+="Northeast;";
+ strRetVal += _T("Northeast;");
}
if(uData&CMPS_SOUTHEAST)
{
- strRetVal+="Southeast;";
+ strRetVal += _T("Southeast;");
}
if(uData&CMPS_SOUTHWEST)
{
- strRetVal+="Southwest;";
+ strRetVal += _T("Southwest;");
}
if(uData&CMPS_NORTHWEST)
{
- strRetVal+="Northwest;";
+ strRetVal += _T("Northwest;");
}
if(uData&CMPS_CENTER)
{
- strRetVal+="Center;";
+ strRetVal += _T("Center;");
}
// Trimming the last semicolon
@@ -221,53 +221,53 @@
UINT uCompassTemp=0;
CString strTemp;
- strTemp="0";
+ strTemp = _T("0");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_NORTH;
}
- strTemp="4";
+ strTemp = _T("4");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_SOUTH;
}
- strTemp="2";
+ strTemp = _T("2");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_EAST;
}
- strTemp="6";
+ strTemp = _T("6");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_WEST;
}
- strTemp="1";
+ strTemp = _T("1");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_NORTHEAST;
}
- strTemp="3";
+ strTemp = _T("3");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_SOUTHEAST;
}
- strTemp="5";
+ strTemp = _T("5");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_SOUTHWEST;
}
- strTemp="7";
+ strTemp = _T("7");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_NORTHWEST;
}
- strTemp="8";
+ strTemp = _T("8");
if(!strTemp.CompareNoCase(strValue))
{
uCompassTemp|=CMPS_CENTER;
@@ -287,43 +287,43 @@
uCapitalValue=0;
// Small case value
- if(strValue.Find('n')!=-1)
+ if(strValue.Find(_T('n'))!=-1)
{
uSmallCaseValue|=CMPS_NORTH;
}
- if(strValue.Find('e')!=-1)
+ if(strValue.Find(_T('e'))!=-1)
{
uSmallCaseValue|=CMPS_EAST;
}
- if(strValue.Find('s')!=-1)
+ if(strValue.Find(_T('s'))!=-1)
{
uSmallCaseValue|=CMPS_SOUTH;
}
- if(strValue.Find('w')!=-1)
+ if(strValue.Find(_T('w'))!=-1)
{
uSmallCaseValue|=CMPS_WEST;
}
// Capital value
- if(strValue.Find('N')!=-1)
+ if(strValue.Find(_T('N'))!=-1)
{
uCapitalValue|=CMPS_NORTH;
}
- if(strValue.Find('E')!=-1)
+ if(strValue.Find(_T('E'))!=-1)
{
uCapitalValue|=CMPS_EAST;
}
- if(strValue.Find('S')!=-1)
+ if(strValue.Find(_T('S'))!=-1)
{
uCapitalValue|=CMPS_SOUTH;
}
- if(strValue.Find('W')!=-1)
+ if(strValue.Find(_T('W'))!=-1)
{
uCapitalValue|=CMPS_WEST;
}
@@ -336,20 +336,20 @@
if(uData&CMPS_NORTH)
{
- strValue+=bIsCapital?"N":"n";
+ strValue+=bIsCapital ? _T("N") : _T("n");
}
if(uData&CMPS_EAST)
{
- strValue+=bIsCapital?"E":"e";
+ strValue+=bIsCapital?_T("E"):_T("e");
}
if(uData&CMPS_SOUTH)
{
- strValue+=bIsCapital?"S":"s";
+ strValue+=bIsCapital?_T("S"):_T("s");
}
if(uData&CMPS_WEST)
{
- strValue+=bIsCapital?"W":"w";
+ strValue+=bIsCapital?_T("W"):_T("w");
}
}
@@ -407,5 +407,5 @@
ASSERT(0); // Invalid compass value
}
- strValue.Format("%u",uMgaValue);
+ strValue.Format(_T("%u"),uMgaValue);
}
\ No newline at end of file
Modified: trunk/GME/ObjectInspector/InPlaceManager.cpp
==============================================================================
--- trunk/GME/ObjectInspector/InPlaceManager.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/InPlaceManager.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -69,7 +69,7 @@
{
strText+=ListItem.Value.stringVal[i];
if( i != uLim)
- strText+="\r\n";
+ strText+=_T("\r\n");
}
// there is no newline at the end of the last line
m_MultiEditCtrl.SetWindowText(strText);//WAS: strText.Left(strText.GetLength()-2)
@@ -199,7 +199,7 @@
{
if(!m_SingleEditCtrl.IsWindowVisible())
{
- m_SingleEditCtrl.SetWindowText("");
+ m_SingleEditCtrl.SetWindowText(_T(""));
m_SingleEditCtrl.MoveWindow(rectBound.left,rectBound.top,rectBound.Width(),rectBound.Height());
m_SingleEditCtrl.ShowWindow(SW_SHOW);
m_SingleEditCtrl.SetFocus();
@@ -379,7 +379,7 @@
{
CString extension;
bool content_type_valid = true;
- if( ListItem.strContentType.GetAt(0) == '.') // starts with '.' -> interpret it as extension
+ if( ListItem.strContentType.GetAt(0) == _T('.')) // starts with '.' -> interpret it as extension
extension = ListItem.strContentType;
else // interpret it as MIME type (Content-Type), and lookup the extension corresponding to it
content_type_valid = CInPlaceManager::findInfoInMimeDB( ListItem.strContentType, szAppPath, extension);
@@ -417,7 +417,7 @@
{
CString strLine = ListItem.Value.stringVal[i];
strLine.TrimRight(_T("\r\n"));
- tempFile.WriteString(strLine + "\n");
+ tempFile.WriteString(strLine + _T("\n"));
}
tempFile.Close();
@@ -427,7 +427,7 @@
{
if( !szAppPath.IsEmpty()) // GMEEditor value found in MimeDB
{
- CString szCommandLine = " ";
+ CString szCommandLine = _T(" ");
szCommandLine += szTempFileName;
int nCommandLineLength = szCommandLine.GetLength();
@@ -446,9 +446,9 @@
if( !launched)
{
// success codes are strictly greater than 32
- int retcode = (int) ShellExecute( (HWND) m_EditorButton, "edit", szTempFileName, 0, 0, SW_SHOWNORMAL);
+ int retcode = (int) ShellExecute( (HWND) m_EditorButton, _T("edit"), szTempFileName, 0, 0, SW_SHOWNORMAL);
if( retcode == SE_ERR_NOASSOC) // failed because no such verb (edit) exists for this extension
- retcode = (int) ShellExecute( (HWND) m_EditorButton, "open", szTempFileName, 0, 0, SW_SHOWNORMAL);
+ retcode = (int) ShellExecute( (HWND) m_EditorButton, _T("open"), szTempFileName, 0, 0, SW_SHOWNORMAL);
launched = retcode > 32;
// if it was not launched successfully, use the specified editor
@@ -467,7 +467,7 @@
catch (hresult_exception &) {
}
- CString szCommandLine = " ";
+ CString szCommandLine = _T(" ");
szCommandLine += szTempFileName;
int nCommandLineLength = szCommandLine.GetLength();
@@ -485,7 +485,7 @@
}
// DWORD h = ::WaitForSingleObject(processInfo.hProcess, INFINITE);
- if( launched) m_EditorButton.MessageBox("Click OK to finish.", "Using External Text Editor", MB_ICONINFORMATION);
+ if( launched) m_EditorButton.MessageBox(_T("Click OK to finish."), _T("Using External Text Editor"), MB_ICONINFORMATION);
// open temporary file
if (tempFile.Open(szTempFileName, CFile::modeRead | CFile::typeText) == 0) {
@@ -660,7 +660,7 @@
nLineLength = 2;
for(int i=0;i<nLines;i++)
{
- strLine="";
+ strLine=_T("");
// nLineLength=m_MultiEditCtrl.LineLength(i);
// LineLength can have a bug!
// Note, that everything works in ANSI here, Unicode would need changes here
@@ -694,7 +694,7 @@
ListItem.Value.SetStringValue(strText);
if(!ListItem.Value.Validate()) {
- m_pInspectorList->MessageBox("Invalid (non ASCII) string data: "+strText,"Object Inspector",MB_ICONERROR);
+ m_pInspectorList->MessageBox(_T("Invalid (non ASCII) string data: ")+strText,_T("Object Inspector"),MB_ICONERROR);
m_pInspectorList->SetFocus();
}
else {
@@ -711,7 +711,7 @@
if(!ListItem.Value.Validate())
{
- m_pInspectorList->MessageBox("Invalid integer data: "+strText,"Object Inspector",MB_ICONERROR);
+ m_pInspectorList->MessageBox(_T("Invalid integer data: ")+strText,_T("Object Inspector"),MB_ICONERROR);
// Restoring correct value
ListItem.Value.toString();
m_pInspectorList->SetFocus();
@@ -731,7 +731,7 @@
if(!ListItem.Value.Validate())
{
- m_pInspectorList->MessageBox("Invalid floating point data: "+strText,"Object Inspector",MB_ICONERROR);
+ m_pInspectorList->MessageBox(_T("Invalid floating point data: ")+strText,_T("Object Inspector"),MB_ICONERROR);
// Restoring correct value
ListItem.Value.toString();
m_pInspectorList->SetFocus();
@@ -799,7 +799,7 @@
// an Extension value exists hopefully
ULONG buff_len = 32; // we don't expect wider extensions than 32
- CString ext(' ', buff_len);
+ CString ext(_T(' '), buff_len);
TCHAR* buff = ext.GetBufferSetLength( buff_len);
res = rk.QueryStringValue( EXTENSION_VALUE, buff, &buff_len);
ext.ReleaseBufferSetLength( buff_len);
@@ -808,7 +808,7 @@
ext.Empty(); // will not return succesfully
buff_len = MAX_PATH;
- CString pref_app(' ', buff_len);
+ CString pref_app(_T(' '), buff_len);
buff = pref_app.GetBufferSetLength( buff_len);
res = rk.QueryStringValue( GMEEDITOR_VALUE, buff, &buff_len);
pref_app.ReleaseBufferSetLength( buff_len);
Modified: trunk/GME/ObjectInspector/InspectorDlg.cpp
==============================================================================
--- trunk/GME/ObjectInspector/InspectorDlg.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/InspectorDlg.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -401,8 +401,8 @@
/*
#ifdef _DEBUG
CString strTemp;
- strTemp.Format("Item Changed: %u on Page %u",wParam,lParam);
- MessageBox(strTemp,"Item Changed");
+ strTemp.Format(_T("Item Changed: %u on Page %u"),wParam,lParam);
+ MessageBox(strTemp,_T("Item Changed"));
#endif
*/
if(lParam==INSP_PREF_PANEL)
Modified: trunk/GME/ObjectInspector/InspectorList.cpp
==============================================================================
--- trunk/GME/ObjectInspector/InspectorList.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/InspectorList.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -343,7 +343,7 @@
{
CListItem ChildListItem=ListItem.m_ContainedListItemArray.GetAt(i);
m_ListItemArray.InsertAt(nChildIndex+i,ChildListItem);
- InsertString(nChildIndex+i,"");
+ InsertString(nChildIndex+i,_T(""));
}
@@ -530,7 +530,7 @@
if(!m_bCategories||nUpperBound==-1)
{
m_ListItemArray.InsertAt(nIndex,ListItem);
- InsertString(nIndex,"");
+ InsertString(nIndex,_T(""));
}
else
{
@@ -556,7 +556,7 @@
else
{
m_ListItemArray.InsertAt(nIndex,ListItem);
- InsertString(nIndex,"");
+ InsertString(nIndex,_T(""));
}
@@ -613,7 +613,7 @@
if(!m_bCategories||nUpperBound==-1)
{
m_ListItemArray.Add(ListItem);
- AddString("");
+ AddString(_T(""));
}
else
{
@@ -639,7 +639,7 @@
else
{
m_ListItemArray.Add(ListItem);
- AddString("");
+ AddString(_T(""));
}
}
@@ -854,7 +854,7 @@
if(nIndex==-1)
{
- pInspectorDlg->SetHelp("","");
+ pInspectorDlg->SetHelp(_T(""),_T(""));
return;
}
@@ -862,7 +862,7 @@
int nSelCount=GetSelCount();
if(nSelCount>1)
{
- pInspectorDlg->SetHelp("Multiple Selection","Select one item to edit its properties \r\nor press Ctrl+D to make selected items default.");
+ pInspectorDlg->SetHelp(_T("Multiple Selection"),_T("Select one item to edit its properties \r\nor press Ctrl+D to make selected items default."));
}
else
{
Modified: trunk/GME/ObjectInspector/InspectorSheet.cpp
==============================================================================
--- trunk/GME/ObjectInspector/InspectorSheet.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/InspectorSheet.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -54,8 +54,8 @@
/*
#ifdef _DEBUG
CString strTemp;
- strTemp.Format("Item Changed: %u",wParam);
- MessageBox(strTemp,"Item Changed");
+ strTemp.Format(_T("Item Changed: %u"),wParam);
+ MessageBox(strTemp,_T("Item Changed"));
#endif
*/
GetParent()->SendMessage(LBN_ON_ITEM_CHANGED,wParam,GetCurFocus());
Modified: trunk/GME/ObjectInspector/ItemData.cpp
==============================================================================
--- trunk/GME/ObjectInspector/ItemData.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/ItemData.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -21,7 +21,7 @@
while( -1 != (iCurrPos = str.FindOneOf(_T("\n"))))
{
returnArray.Add(str.Left(iCurrPos));
- returnArray[iNum].TrimRight("\r\n");
+ returnArray[iNum].TrimRight(_T("\r\n"));
str = str.Right(str.GetLength() - iCurrPos - 1);
iNum++;
}
@@ -29,13 +29,13 @@
if (str.GetLength() > 0) // the last one...
{
returnArray.Add(str);
- returnArray[iNum].TrimRight("\r\n");
+ returnArray[iNum].TrimRight(_T("\r\n"));
iNum++;
}
}
-/*static*/ const char * CItemData::m_defFMTSTR = "%.12g";
-/*static*/ CString CItemData::m_fmtStr = "%.12g";
+/*static*/ const TCHAR * CItemData::m_defFMTSTR = _T("%.12g");
+/*static*/ CString CItemData::m_fmtStr = _T("%.12g");
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
@@ -172,9 +172,9 @@
retVal=false;
if(stringVal.GetSize()==1)
{
- char*endptr;
- long l=strtol(stringVal[0],&endptr,10);
- if(*endptr=='\0')
+ TCHAR* endptr;
+ long l = _tcstol(stringVal[0], &endptr, 10);
+ if(*endptr==_T('\0'))
{
intVal=l;
retVal=true;
@@ -190,9 +190,9 @@
retVal=false;
if(stringVal.GetSize()==1)
{
- char*endptr;
- double d=strtod(stringVal[0],&endptr);
- if(*endptr=='\0')
+ TCHAR* endptr;
+ double d = _tcstod(stringVal[0], &endptr);
+ if(*endptr == _T('\0'))
{
doubleVal=d;
retVal=true;
@@ -210,12 +210,12 @@
retVal=false;
if(stringVal.GetSize()==1)
{
- if(stringVal[0]=="True")
+ if(stringVal[0]==_T("True"))
{
boolVal=true;
retVal=true;
}
- else if(stringVal[0]=="False")
+ else if(stringVal[0]==_T("False"))
{
boolVal=false;
retVal=true;
@@ -233,9 +233,9 @@
retVal=false;
if(stringVal.GetSize()==1)
{
- char*endptr;
- long l=strtol(stringVal[0],&endptr,16);
- if(*endptr=='\0')
+ TCHAR* endptr;
+ long l = _tcstol(stringVal[0], &endptr, 16);
+ if(*endptr == _T('\0'))
{
colorVal=l;
retVal=true;
@@ -413,9 +413,9 @@
{
strString+=stringVal[i];
if( i != nUpperBound)
- strString+="\r\n";
+ strString+=_T("\r\n");
}
- //WAS: Trimming last "\r\n"
+ //WAS: Trimming last _T("\r\n")
//WAS: strString=strString.Left(strString.GetLength()-2);
bRetVal=true;
}
@@ -444,7 +444,7 @@
case ITEMDATA_INTEGER:
{
- strString.Format("%d",intVal);
+ strString.Format(_T("%d"),intVal);
bRetVal=true;
}break;
case ITEMDATA_DOUBLE:
@@ -456,18 +456,18 @@
{
if(boolVal)
{
- strString="True";
+ strString=_T("True");
}
else
{
- strString="False";
+ strString=_T("False");
}
bRetVal=true;
}break;
case ITEMDATA_COLOR :
{
- strString.Format("Red: %u; Green: %u; Blue: %u;",GetRValue(colorVal),GetGValue(colorVal),GetBValue(colorVal));
+ strString.Format(_T("Red: %u; Green: %u; Blue: %u;"),GetRValue(colorVal),GetGValue(colorVal),GetBValue(colorVal));
bRetVal=true;
}break;
Modified: trunk/GME/ObjectInspector/ItemData.h
==============================================================================
--- trunk/GME/ObjectInspector/ItemData.h Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/ItemData.h Wed Mar 30 13:00:56 2011 (r1221)
@@ -35,7 +35,7 @@
friend class CInspectorList;
void CommonInit();
public:
- static const char * m_defFMTSTR;
+ static const TCHAR * m_defFMTSTR;
static CString m_fmtStr;
static void getRealFmtString();
Modified: trunk/GME/ObjectInspector/ObjectInspector.vcxproj
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.vcxproj Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/ObjectInspector.vcxproj Wed Mar 30 13:00:56 2011 (r1221)
@@ -23,13 +23,13 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Dynamic</UseOfMfc>
<UseOfAtl>Dynamic</UseOfAtl>
- <CharacterSet>MultiByte</CharacterSet>
+ <CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|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">
@@ -239,4 +239,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/ObjectInspectorCtl.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -216,7 +216,7 @@
CRect edge(rcBounds);
pdc->DrawEdge(&edge, EDGE_BUMP, BF_RECT);
- CString label("ObjectInspector OCX");
+ CString label(_T("ObjectInspector OCX"));
BITMAP bm;
CBitmap bitmap;
@@ -235,7 +235,7 @@
dcMem.SelectObject(oldbitmap);
pdc->SetTextAlign(TA_CENTER);
- pdc->TextOut(rcBounds.Width()/2, rcBounds.Height()/2, CString("ObjectInspector ActiveX Control"));
+ pdc->TextOut(rcBounds.Width()/2, rcBounds.Height()/2, CString(_T("ObjectInspector ActiveX Control")));
}
}
@@ -476,7 +476,7 @@
m_FolderList.RemoveAll();
m_objects=NULL;
- CWnd::MessageBox("Object Inspector could not hand over the project data due to an unexpected error. We apoligize for the inconvenience.","Object inspector",MB_ICONERROR);
+ CWnd::MessageBox(_T("Object Inspector could not hand over the project data due to an unexpected error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
}
SetModifiedFlag();
@@ -519,7 +519,7 @@
{
ASSERT(0);
m_project->AbortTransaction();
- CWnd::MessageBox("Object Inspector could not load object data due to an unexpected MGA error. We apoligize for the inconvenience.","Object inspector",MB_ICONERROR);
+ CWnd::MessageBox(_T("Object Inspector could not load object data due to an unexpected MGA error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
}
m_inspectorDlg.Refresh();
@@ -909,7 +909,7 @@
{
ASSERT(0);
m_project->AbortTransaction();
- CWnd::MessageBox("Object Inspector could not write attribute data due to an unexpected error. We apologize for the inconvenience.","Object inspector",MB_ICONERROR);
+ CWnd::MessageBox(_T("Object Inspector could not write attribute data due to an unexpected error. We apologize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
}
}
@@ -962,7 +962,7 @@
{
ccpMetaProject->AbortTransaction();
}
- CWnd::MessageBox("Object Inspector could not write object preference data due to an unexpected MGA error. We apoligize for the inconvenience.","Object inspector",MB_ICONERROR);
+ CWnd::MessageBox(_T("Object Inspector could not write object preference data due to an unexpected MGA error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
}
}
@@ -991,7 +991,7 @@
}
else
{
- strName+=";"+CString(bstrName);
+ strName+=_T(";")+CString(bstrName);
}
}
@@ -1014,7 +1014,7 @@
}
else
{
- strName+=";"+CString(bstrName);
+ strName+=_T(";")+CString(bstrName);
}
}
@@ -1103,7 +1103,7 @@
{
ASSERT(0);
m_project->AbortTransaction();
- CWnd::MessageBox("Object Inspector could not write object name due to an unexpected MGA error. We apoligize for the inconvenience.","Object inspector",MB_ICONERROR);
+ CWnd::MessageBox(_T("Object Inspector could not write object name due to an unexpected MGA error. We apoligize for the inconvenience."),_T("Object inspector"),MB_ICONERROR);
}
}
Modified: trunk/GME/ObjectInspector/Preference.cpp
==============================================================================
--- trunk/GME/ObjectInspector/Preference.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/Preference.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -19,15 +19,15 @@
// LINE_STYLE_LIST (butt,arrow,diamond)
#define LINE_STYLE_LIST_SIZE 10
-char *CPreference::m_szLineStyleList[]={"butt", "arrow", "diamond", "apex", "bullet", "empty diamond", "empty apex", "empty bullet", "left half arrow", "right half arrow" };
+TCHAR *CPreference::m_szLineStyleList[]={_T("butt"), _T("arrow"), _T("diamond"), _T("apex"), _T("bullet"), _T("empty diamond"), _T("empty apex"), _T("empty bullet"), _T("left half arrow"), _T("right half arrow") };
// LINE_TYPE_LIST (solid,dash)
#define LINE_TYPE_LIST_SIZE 2
-char *CPreference::m_szLineTypeList[]={"solid", "dash"};
+TCHAR *CPreference::m_szLineTypeList[]={_T("solid"), _T("dash")};
// BOOLEAN_LIST
#define BOOLEAN_LIST_SIZE 2
-char *CPreference::m_szBooleanList[]={"true", "false"};
+TCHAR *CPreference::m_szBooleanList[]={_T("true"), _T("false")};
@@ -35,157 +35,157 @@
// Connection Preferences
/**** Type ************* Path In Registry ** Default Value ** Name to display ************ Help Text *******************************************************************************************************************************************************/
-char *CPreference::m_szConnectionPreferenceTable[][5]=
+TCHAR *CPreference::m_szConnectionPreferenceTable[][5]=
{
- {"COLOR", "color", "0x000000", "Color", "Connection line color. Set this value to change the connection line color."},
- {"COLOR", "nameColor", "0x000000", "Name color", "Connection label color. Set this value to change the connection label color."},
- {"STRING", "help", "", "Help URL", "Sets this value to specify the URL containig the help information belonging to the connection."},
- {"MULTISTRING", "description", "", "Description", "Free format description of the model element for documentation purposes."},
- {"LINE_STYLE_LIST", "srcStyle", "butt", "Source end style", "Sets this value to specify the source end style of the connection. Eg. Arrow."},
- {"LINE_STYLE_LIST", "dstStyle", "butt", "Destination end style", "Sets this value to specify the destination end style of the connection. Eg. Arrow."},
- {"LINE_TYPE_LIST", "lineType", "solid", "Line type", "Sets this value to specify the connection line type. Eg. Dashed."},
- {"STRING", "labelFormatStr", "", "Label format string", "Sets this value to form a centered connection label from the connection attributes. Eg. %name%"},
- {"STRING", "srcLabel1", "<blank>", "Source primary attribute", "Displays an attribute as a label on the source side of the connection."},
- {"STRING", "srcLabel2", "<blank>", "Source secondary attribute", "Displays an attribute as a label on the source side of the connection."},
- {"STRING", "dstLabel1", "<blank>", "Destination primary attribute", "Displays an attribute as a label on the destination side of the connection."},
- {"STRING", "dstLabel2", "<blank>", "Destination secondary attribute", "Displays an attribute as a label on the destination side of the connection."},
- {"BOOLEAN_LIST", "isAutoRouted", "true", "Is auto routed", "Is the connection treated by the auto router."}
+ {_T("COLOR"), _T("color"), _T("0x000000"), _T("Color"), _T("Connection line color. Set this value to change the connection line color.")},
+ {_T("COLOR"), _T("nameColor"), _T("0x000000"), _T("Name color"), _T("Connection label color. Set this value to change the connection label color.")},
+ {_T("STRING"), _T("help"), _T(""), _T("Help URL"), _T("Sets this value to specify the URL containig the help information belonging to the connection.")},
+ {_T("MULTISTRING"), _T("description"), _T(""), _T("Description"), _T("Free format description of the model element for documentation purposes.")},
+ {_T("LINE_STYLE_LIST"), _T("srcStyle"), _T("butt"), _T("Source end style"), _T("Sets this value to specify the source end style of the connection. Eg. Arrow.")},
+ {_T("LINE_STYLE_LIST"), _T("dstStyle"), _T("butt"), _T("Destination end style"), _T("Sets this value to specify the destination end style of the connection. Eg. Arrow.")},
+ {_T("LINE_TYPE_LIST"), _T("lineType"), _T("solid"), _T("Line type"), _T("Sets this value to specify the connection line type. Eg. Dashed.")},
+ {_T("STRING"), _T("labelFormatStr"), _T(""), _T("Label format string"), _T("Sets this value to form a centered connection label from the connection attributes. Eg. %name%")},
+ {_T("STRING"), _T("srcLabel1"), _T("<blank>"), _T("Source primary attribute"), _T("Displays an attribute as a label on the source side of the connection.")},
+ {_T("STRING"), _T("srcLabel2"), _T("<blank>"), _T("Source secondary attribute"), _T("Displays an attribute as a label on the source side of the connection.")},
+ {_T("STRING"), _T("dstLabel1"), _T("<blank>"), _T("Destination primary attribute"), _T("Displays an attribute as a label on the destination side of the connection.")},
+ {_T("STRING"), _T("dstLabel2"), _T("<blank>"), _T("Destination secondary attribute"), _T("Displays an attribute as a label on the destination side of the connection.")},
+ {_T("BOOLEAN_LIST"), _T("isAutoRouted"), _T("true"), _T("Is auto routed"), _T("Is the connection treated by the auto router.")}
};
// Atom Preferences
/**** Type ************* Path In Registry ** Default Value ** Name to display ************ Help Text *******************************************************************************************************************************************************/
-char* CPreference::m_szAtomPreferenceTable[][5]=
+TCHAR* CPreference::m_szAtomPreferenceTable[][5]=
{
- {"COLOR", "color", "0x000000", "Color", "Atom color. Set this value to change the atom line color."},
- {"COLOR", "nameColor", "0x000000", "Name color", "Atom name label color. Set this value to change the atom name label color."},
- {"COLOR", "fillColor", "0xFFFFFF", "Fill color", "Atom background fill color for the closed models."},
- {"BOOLEAN_LIST", "gradientFill", "false", "Gradient fill enabled", "Is the gradient fill feature enabled."},
- {"COLOR", "gradientColor", "0xc0c0c0", "Gradient (2nd fill) color", "Atom gradient background color (the other fill color)."},
- {"STRING", "gradientDirection","0", "Gradient direction (angle)", "Direction of the gradient fill."},
- {"BOOLEAN_LIST", "itemShadowCast", "false", "Shadow casting enabled", "Is the shadow casting feature enabled."},
- {"COLOR", "shadowColor", "0xc0c0c0", "Shadow color", "Atom shadow color."},
- {"STRING", "shadowThickness", "9", "Shadow thickness/offset", "Thickness/offset of the shadow."},
- {"STRING", "shadowDirection", "45", "Shadow direction (angle)", "Direction of the shadow (angle)."},
- {"BOOLEAN_LIST", "roundCornerRect", "false", "Round rectangle corner enabled","Is rounding of rectangle corner feature enabled."},
- {"STRING", "roundCornerRadius","9", "Round rectangle corner radius","Radius of round rectangle corner."},
- {"STRING", "help", "", "Help URL", "Sets this value to specify the URL containig the help information belonging to the atom."},
- {"MULTISTRING", "description", "", "Description", "Free format description of the model element for documentation purposes."},
- {"COMPASS_OPTION", "namePosition", "4", "Name Location", "Sets the name label location relative to the atom icon. Eg. North."},
- {"STRING", "nameWrap", "0", "NameWrap number", "Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled."},
- {"BOOLEAN_LIST", "isNameEnabled", "true", "Name enabled", "Displays the name."},
- {"COMPASS_CHECK", "autorouterPref", "neswNESW", "Auto Router Preference", "Sets the allowed stick point of the connections from and to this atom."},
- {"BOOLEAN_LIST", "isHotspotEnabled", "true", "Hotspots enabled", "Enables the hotspot feature in connection mode."},
- {"BOOLEAN_LIST", "isTypeShown", "false", "Type displayed", "Displays the type (subtype) if the atom is an Instance"},
- {"STRING", "decorator", "", "Decorator", "ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]"},
- {"STRING", "icon", "", "Icon name", "Image(.bmp,.gif) file name to display the atom. Icon search paths can be set in File/Settings menu."},
- {"STRING", "porticon", "", "Port icon name", "Specifies the image(.bmp,.gif) file name to display the atom if it is a port in a model."},
- {"STRING", "subTypeIcon", "", "Subtype icon name", "Image(.bmp,.gif) file name to display the atom if it a subtype. Icon search paths can be set in File/Settings menu."},
- {"STRING", "instanceIcon", "", "Instance icon name", "Image(.bmp,.gif) file name to display the atom if it an instance. Icon search paths can be set in File/Settings menu."}
+ {_T("COLOR"), _T("color"), _T("0x000000"), _T("Color"), _T("Atom color. Set this value to change the atom line color.")},
+ {_T("COLOR"), _T("nameColor"), _T("0x000000"), _T("Name color"), _T("Atom name label color. Set this value to change the atom name label color.")},
+ {_T("COLOR"), _T("fillColor"), _T("0xFFFFFF"), _T("Fill color"), _T("Atom background fill color for the closed models.")},
+ {_T("BOOLEAN_LIST"), _T("gradientFill"), _T("false"), _T("Gradient fill enabled"), _T("Is the gradient fill feature enabled.")},
+ {_T("COLOR"), _T("gradientColor"), _T("0xc0c0c0"), _T("Gradient (2nd fill) color"), _T("Atom gradient background color (the other fill color).")},
+ {_T("STRING"), _T("gradientDirection"),_T("0"), _T("Gradient direction (angle)"), _T("Direction of the gradient fill.")},
+ {_T("BOOLEAN_LIST"), _T("itemShadowCast"), _T("false"), _T("Shadow casting enabled"), _T("Is the shadow casting feature enabled.")},
+ {_T("COLOR"), _T("shadowColor"), _T("0xc0c0c0"), _T("Shadow color"), _T("Atom shadow color.")},
+ {_T("STRING"), _T("shadowThickness"), _T("9"), _T("Shadow thickness/offset"), _T("Thickness/offset of the shadow.")},
+ {_T("STRING"), _T("shadowDirection"), _T("45"), _T("Shadow direction (angle)"), _T("Direction of the shadow (angle).")},
+ {_T("BOOLEAN_LIST"), _T("roundCornerRect"), _T("false"), _T("Round rectangle corner enabled"),_T("Is rounding of rectangle corner feature enabled.")},
+ {_T("STRING"), _T("roundCornerRadius"),_T("9"), _T("Round rectangle corner radius"),_T("Radius of round rectangle corner.")},
+ {_T("STRING"), _T("help"), _T(""), _T("Help URL"), _T("Sets this value to specify the URL containig the help information belonging to the atom.")},
+ {_T("MULTISTRING"), _T("description"), _T(""), _T("Description"), _T("Free format description of the model element for documentation purposes.")},
+ {_T("COMPASS_OPTION"), _T("namePosition"), _T("4"), _T("Name Location"), _T("Sets the name label location relative to the atom icon. Eg. North.")},
+ {_T("STRING"), _T("nameWrap"), _T("0"), _T("NameWrap number"), _T("Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled.")},
+ {_T("BOOLEAN_LIST"), _T("isNameEnabled"), _T("true"), _T("Name enabled"), _T("Displays the name.")},
+ {_T("COMPASS_CHECK"), _T("autorouterPref"), _T("neswNESW"), _T("Auto Router Preference"), _T("Sets the allowed stick point of the connections from and to this atom.")},
+ {_T("BOOLEAN_LIST"), _T("isHotspotEnabled"), _T("true"), _T("Hotspots enabled"), _T("Enables the hotspot feature in connection mode.")},
+ {_T("BOOLEAN_LIST"), _T("isTypeShown"), _T("false"), _T("Type displayed"), _T("Displays the type (subtype) if the atom is an Instance")},
+ {_T("STRING"), _T("decorator"), _T(""), _T("Decorator"), _T("ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]")},
+ {_T("STRING"), _T("icon"), _T(""), _T("Icon name"), _T("Image(.bmp,.gif) file name to display the atom. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("porticon"), _T(""), _T("Port icon name"), _T("Specifies the image(.bmp,.gif) file name to display the atom if it is a port in a model.")},
+ {_T("STRING"), _T("subTypeIcon"), _T(""), _T("Subtype icon name"), _T("Image(.bmp,.gif) file name to display the atom if it a subtype. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("instanceIcon"), _T(""), _T("Instance icon name"), _T("Image(.bmp,.gif) file name to display the atom if it an instance. Icon search paths can be set in File/Settings menu.")}
};
// Model Preferences - item [3][2] is corrected in the constructor
/**** Type ************* Path In Registry ** Default Value ** Name to display ************ Help Text *******************************************************************************************************************************************************/
-char* CPreference::m_szModelPreferenceTable[][5]=
+TCHAR* CPreference::m_szModelPreferenceTable[][5]=
{
- {"COLOR", "color", "0xc0c0c0", "Color", "Model color. Set this value to change the model line color."},
- {"COLOR", "nameColor", "0x000000", "Name color", "Model name label color. Set this value to change the model name label color."},
- {"COLOR", "borderColor", "0x000000", "Border color", "Model border color. Set this value to change the model border color."},
- {"COLOR", "backgroundColor", NULL,/*->Const*/"Background color", "Window background color for the open models."},
- {"COLOR", "fillColor", "0xFFFFFF", "Fill color", "Model background fill color for the closed models."},
- {"BOOLEAN_LIST", "gradientFill", "false", "Gradient fill enabled", "Is the gradient fill feature enabled."},
- {"COLOR", "gradientColor", "0xc0c0c0", "Gradient (2nd fill) color", "Model gradient background color for the closed models (the other fill color)."},
- {"STRING", "gradientDirection","0", "Gradient direction (angle)", "Direction of the gradient (angle)."},
- {"BOOLEAN_LIST", "itemShadowCast", "false", "Shadow casting enabled", "Is the shadow casting feature enabled."},
- {"COLOR", "shadowColor", "0xc0c0c0", "Shadow color", "Model shadow color for the closed models."},
- {"STRING", "shadowThickness", "9", "Shadow thickness/offset", "Thickness/offset of the shadow."},
- {"STRING", "shadowDirection", "45", "Shadow direction (angle)", "Direction of the shadow (angle)."},
- {"BOOLEAN_LIST", "roundCornerRect", "false", "Round rectangle corner enabled", "Is rounding of rectangle corner feature enabled."},
- {"STRING", "roundCornerRadius","9", "Round rectangle corner radius", "Radius of round rectangle corner."},
- {"COLOR", "portColor", "0x000000", "Port name color", "Port name color for the displayed ports of this model."},
- {"STRING", "help", "", "Help URL", "Sets this value to specify the URL containig the help information belonging to the model."},
- {"MULTISTRING", "description", "", "Description", "Free format description of the model element for documentation purposes."},
- {"COMPASS_OPTION", "namePosition", "4", "Name Location", "Sets the name label location relative to the atom icon. Eg. North."},
- {"STRING", "nameWrap", "0", "NameWrap number", "Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled."},
- {"BOOLEAN_LIST", "isNameEnabled", "true", "Name enabled", "Displays the name."},
- {"BOOLEAN_LIST", "isModelAutoRouted","true", "Is auto routed", "Are the models' connections treated by the auto router by default."},
- {"COMPASS_CHECK", "autorouterPref", "neswNESW", "Auto Router Preference", "Sets the allowed stick point of the connections from and to this model."},
- {"BOOLEAN_LIST", "isHotspotEnabled", "true", "Hotspots enabled", "Enables the hotspot feature in connection mode."},
- {"BOOLEAN_LIST", "isTypeShown", "false", "Type displayed", "Displays the type (subtype) if the model is an Instance"},
- {"BOOLEAN_LIST", "isTypeInfoShown", "false", "Typeinfo displayed", "Displays T, S or I letter according to that the model is Type, Subtype or Instance"},
- {"STRING", "decorator", "", "Decorator", "ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]"},
- {"STRING", "icon", "", "Icon name", "Image(.bmp,.gif) file name to display the model. Icon search paths can be set in File/Settings menu."},
- {"STRING", "porticon", "", "Port icon name", "Specifies the image(.bmp,.gif) file name to display this model if it is a port in another model."},
- {"STRING", "subTypeIcon", "", "Subtype icon name", "Image(.bmp,.gif) file name to display the model if it a subtype. Icon search paths can be set in File/Settings menu."},
- {"STRING", "instanceIcon", "", "Instance icon name", "Image(.bmp,.gif) file name to display the model if it an instance. Icon search paths can be set in File/Settings menu."},
- {"BOOLEAN_LIST", "portLabelInside", "true", "PortLabel shown inside container?", "Portname label may be shown either inside or outside the container."},
- {"STRING", "portLabelLength", "3", "PortLabel Length", "Sets the text length shown when displaying portnames. If 0 total length is shown."}
+ {_T("COLOR"), _T("color"), _T("0xc0c0c0"), _T("Color"), _T("Model color. Set this value to change the model line color.")},
+ {_T("COLOR"), _T("nameColor"), _T("0x000000"), _T("Name color"), _T("Model name label color. Set this value to change the model name label color.")},
+ {_T("COLOR"), _T("borderColor"), _T("0x000000"), _T("Border color"), _T("Model border color. Set this value to change the model border color.")},
+ {_T("COLOR"), _T("backgroundColor"), NULL,/*->Const*/_T("Background color"), _T("Window background color for the open models.")},
+ {_T("COLOR"), _T("fillColor"), _T("0xFFFFFF"), _T("Fill color"), _T("Model background fill color for the closed models.")},
+ {_T("BOOLEAN_LIST"), _T("gradientFill"), _T("false"), _T("Gradient fill enabled"), _T("Is the gradient fill feature enabled.")},
+ {_T("COLOR"), _T("gradientColor"), _T("0xc0c0c0"), _T("Gradient (2nd fill) color"), _T("Model gradient background color for the closed models (the other fill color).")},
+ {_T("STRING"), _T("gradientDirection"),_T("0"), _T("Gradient direction (angle)"), _T("Direction of the gradient (angle).")},
+ {_T("BOOLEAN_LIST"), _T("itemShadowCast"), _T("false"), _T("Shadow casting enabled"), _T("Is the shadow casting feature enabled.")},
+ {_T("COLOR"), _T("shadowColor"), _T("0xc0c0c0"), _T("Shadow color"), _T("Model shadow color for the closed models.")},
+ {_T("STRING"), _T("shadowThickness"), _T("9"), _T("Shadow thickness/offset"), _T("Thickness/offset of the shadow.")},
+ {_T("STRING"), _T("shadowDirection"), _T("45"), _T("Shadow direction (angle)"), _T("Direction of the shadow (angle).")},
+ {_T("BOOLEAN_LIST"), _T("roundCornerRect"), _T("false"), _T("Round rectangle corner enabled"), _T("Is rounding of rectangle corner feature enabled.")},
+ {_T("STRING"), _T("roundCornerRadius"),_T("9"), _T("Round rectangle corner radius"), _T("Radius of round rectangle corner.")},
+ {_T("COLOR"), _T("portColor"), _T("0x000000"), _T("Port name color"), _T("Port name color for the displayed ports of this model.")},
+ {_T("STRING"), _T("help"), _T(""), _T("Help URL"), _T("Sets this value to specify the URL containig the help information belonging to the model.")},
+ {_T("MULTISTRING"), _T("description"), _T(""), _T("Description"), _T("Free format description of the model element for documentation purposes.")},
+ {_T("COMPASS_OPTION"), _T("namePosition"), _T("4"), _T("Name Location"), _T("Sets the name label location relative to the atom icon. Eg. North.")},
+ {_T("STRING"), _T("nameWrap"), _T("0"), _T("NameWrap number"), _T("Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled.")},
+ {_T("BOOLEAN_LIST"), _T("isNameEnabled"), _T("true"), _T("Name enabled"), _T("Displays the name.")},
+ {_T("BOOLEAN_LIST"), _T("isModelAutoRouted"),_T("true"), _T("Is auto routed"), _T("Are the models' connections treated by the auto router by default.")},
+ {_T("COMPASS_CHECK"), _T("autorouterPref"), _T("neswNESW"), _T("Auto Router Preference"), _T("Sets the allowed stick point of the connections from and to this model.")},
+ {_T("BOOLEAN_LIST"), _T("isHotspotEnabled"), _T("true"), _T("Hotspots enabled"), _T("Enables the hotspot feature in connection mode.")},
+ {_T("BOOLEAN_LIST"), _T("isTypeShown"), _T("false"), _T("Type displayed"), _T("Displays the type (subtype) if the model is an Instance")},
+ {_T("BOOLEAN_LIST"), _T("isTypeInfoShown"), _T("false"), _T("Typeinfo displayed"), _T("Displays T, S or I letter according to that the model is Type, Subtype or Instance")},
+ {_T("STRING"), _T("decorator"), _T(""), _T("Decorator"), _T("ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]")},
+ {_T("STRING"), _T("icon"), _T(""), _T("Icon name"), _T("Image(.bmp,.gif) file name to display the model. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("porticon"), _T(""), _T("Port icon name"), _T("Specifies the image(.bmp,.gif) file name to display this model if it is a port in another model.")},
+ {_T("STRING"), _T("subTypeIcon"), _T(""), _T("Subtype icon name"), _T("Image(.bmp,.gif) file name to display the model if it a subtype. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("instanceIcon"), _T(""), _T("Instance icon name"), _T("Image(.bmp,.gif) file name to display the model if it an instance. Icon search paths can be set in File/Settings menu.")},
+ {_T("BOOLEAN_LIST"), _T("portLabelInside"), _T("true"), _T("PortLabel shown inside container?"), _T("Portname label may be shown either inside or outside the container.")},
+ {_T("STRING"), _T("portLabelLength"), _T("3"), _T("PortLabel Length"), _T("Sets the text length shown when displaying portnames. If 0 total length is shown.")}
};
// Reference (Proxy) Preferences
/**** Type ************* Path In Registry ** Default Value ** Name to display ************ Help Text *******************************************************************************************************************************************************/
-char* CPreference::m_szProxyPreferenceTable[][5]=
+TCHAR* CPreference::m_szProxyPreferenceTable[][5]=
{
- {"COLOR", "color", "0xc0c0c0", "Color", "Proxy color. Set this value to change the proxy line color."},
- {"COLOR", "nameColor", "0x000000", "Name color", "Proxy name label color. Set this value to change the proxy name label color."},
- {"COLOR", "fillColor", "0xFFFFFF", "Fill color", "Proxy background fill color for the closed models."},
- {"BOOLEAN_LIST", "gradientFill", "false", "Gradient fill enabled", "Is the gradient fill feature enabled."},
- {"COLOR", "gradientColor", "0xc0c0c0", "Gradient (2nd fill) color", "Proxy gradient background color for the closed models (the other fill color)."},
- {"STRING", "gradientDirection","0", "Gradient direction (angle)", "Direction of the gradient fill."},
- {"BOOLEAN_LIST", "itemShadowCast", "false", "Shadow casting enabled", "Is the shadow casting feature enabled."},
- {"COLOR", "shadowColor", "0xc0c0c0", "Shadow color", "Proxy shadow color."},
- {"STRING", "shadowThickness", "9", "Shadow thickness/offset", "Thickness/offset of the shadow."},
- {"STRING", "shadowDirection", "45", "Shadow direction (angle)", "Direction of the shadow (angle)."},
- {"BOOLEAN_LIST", "roundCornerRect", "false", "Round rectangle corner enabled", "Is rounding of rectangle corner feature enabled."},
- {"STRING", "roundCornerRadius","9", "Round rectangle corner radius", "Radius of round rectangle corner."},
- {"STRING", "help", "", "Help URL", "Sets this value to specify the URL containig the help information belonging to the proxy."},
- {"MULTISTRING", "description", "", "Description", "Free format description of the model element for documentation purposes."},
- {"COMPASS_OPTION", "namePosition", "4", "Name Location", "Sets the name label location relative to the proxy icon. Eg. North."},
- {"STRING", "nameWrap", "0", "NameWrap number", "Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled."},
- {"BOOLEAN_LIST", "isNameEnabled", "true", "Name enabled", "Displays the name."},
- {"COMPASS_CHECK", "autorouterPref", "neswNESW", "Auto Router Preference", "Sets the allowed stick point of the connections from and to this proxy."},
- {"BOOLEAN_LIST", "isHotspotEnabled", "true", "Hotspots enabled", "Enables the hotspot feature in connection mode."},
- {"COLOR", "borderColor", "0x000000", "Border color", "Proxy border color. Set this value to change the proxy border color."},
- {"COLOR", "portColor", "0x000000", "Port name color", "Port name color for the displayed ports of this proxy."},
- {"STRING", "decorator", "", "Decorator", "ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]"},
- {"STRING", "icon", "", "Icon name", "Image(.bmp,.gif) file name to display the proxy. Icon search paths can be set in File/Settings menu."},
- {"STRING", "porticon", "", "Port icon name", "Specifies the image(.bmp,.gif) file name to display the proxy if it is a port in a proxy."},
- {"BOOLEAN_LIST", "portLabelInside", "true", "PortLabel shown inside container?", "Portname label may be shown either inside or outside the container."},
- {"STRING", "portLabelLength", "3", "PortLabel Length", "Sets the text length shown when displaying portnames. If 0 total length is shown."}
+ {_T("COLOR"), _T("color"), _T("0xc0c0c0"), _T("Color"), _T("Proxy color. Set this value to change the proxy line color.")},
+ {_T("COLOR"), _T("nameColor"), _T("0x000000"), _T("Name color"), _T("Proxy name label color. Set this value to change the proxy name label color.")},
+ {_T("COLOR"), _T("fillColor"), _T("0xFFFFFF"), _T("Fill color"), _T("Proxy background fill color for the closed models.")},
+ {_T("BOOLEAN_LIST"), _T("gradientFill"), _T("false"), _T("Gradient fill enabled"), _T("Is the gradient fill feature enabled.")},
+ {_T("COLOR"), _T("gradientColor"), _T("0xc0c0c0"), _T("Gradient (2nd fill) color"), _T("Proxy gradient background color for the closed models (the other fill color).")},
+ {_T("STRING"), _T("gradientDirection"),_T("0"), _T("Gradient direction (angle)"), _T("Direction of the gradient fill.")},
+ {_T("BOOLEAN_LIST"), _T("itemShadowCast"), _T("false"), _T("Shadow casting enabled"), _T("Is the shadow casting feature enabled.")},
+ {_T("COLOR"), _T("shadowColor"), _T("0xc0c0c0"), _T("Shadow color"), _T("Proxy shadow color.")},
+ {_T("STRING"), _T("shadowThickness"), _T("9"), _T("Shadow thickness/offset"), _T("Thickness/offset of the shadow.")},
+ {_T("STRING"), _T("shadowDirection"), _T("45"), _T("Shadow direction (angle)"), _T("Direction of the shadow (angle).")},
+ {_T("BOOLEAN_LIST"), _T("roundCornerRect"), _T("false"), _T("Round rectangle corner enabled"), _T("Is rounding of rectangle corner feature enabled.")},
+ {_T("STRING"), _T("roundCornerRadius"),_T("9"), _T("Round rectangle corner radius"), _T("Radius of round rectangle corner.")},
+ {_T("STRING"), _T("help"), _T(""), _T("Help URL"), _T("Sets this value to specify the URL containig the help information belonging to the proxy.")},
+ {_T("MULTISTRING"), _T("description"), _T(""), _T("Description"), _T("Free format description of the model element for documentation purposes.")},
+ {_T("COMPASS_OPTION"), _T("namePosition"), _T("4"), _T("Name Location"), _T("Sets the name label location relative to the proxy icon. Eg. North.")},
+ {_T("STRING"), _T("nameWrap"), _T("0"), _T("NameWrap number"), _T("Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled.")},
+ {_T("BOOLEAN_LIST"), _T("isNameEnabled"), _T("true"), _T("Name enabled"), _T("Displays the name.")},
+ {_T("COMPASS_CHECK"), _T("autorouterPref"), _T("neswNESW"), _T("Auto Router Preference"), _T("Sets the allowed stick point of the connections from and to this proxy.")},
+ {_T("BOOLEAN_LIST"), _T("isHotspotEnabled"), _T("true"), _T("Hotspots enabled"), _T("Enables the hotspot feature in connection mode.")},
+ {_T("COLOR"), _T("borderColor"), _T("0x000000"), _T("Border color"), _T("Proxy border color. Set this value to change the proxy border color.")},
+ {_T("COLOR"), _T("portColor"), _T("0x000000"), _T("Port name color"), _T("Port name color for the displayed ports of this proxy.")},
+ {_T("STRING"), _T("decorator"), _T(""), _T("Decorator"), _T("ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]")},
+ {_T("STRING"), _T("icon"), _T(""), _T("Icon name"), _T("Image(.bmp,.gif) file name to display the proxy. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("porticon"), _T(""), _T("Port icon name"), _T("Specifies the image(.bmp,.gif) file name to display the proxy if it is a port in a proxy.")},
+ {_T("BOOLEAN_LIST"), _T("portLabelInside"), _T("true"), _T("PortLabel shown inside container?"), _T("Portname label may be shown either inside or outside the container.")},
+ {_T("STRING"), _T("portLabelLength"), _T("3"), _T("PortLabel Length"), _T("Sets the text length shown when displaying portnames. If 0 total length is shown.")}
};
// Set Preferences
/**** Type ************* Path In Registry ** Default Value ** Name to display ************ Help Text *******************************************************************************************************************************************************/
-char* CPreference::m_szSetPreferenceTable[][5]=
+TCHAR* CPreference::m_szSetPreferenceTable[][5]=
{
- {"COLOR", "color", "0x000000", "Color", "Set color. Set this value to change the set line color."},
- {"COLOR", "nameColor", "0x000000", "Name color", "Set name label color. Set this value to change the set name label color."},
- {"COLOR", "fillColor", "0xFFFFFF", "Fill color", "Set background fill color for the closed models."},
- {"BOOLEAN_LIST", "gradientFill", "false", "Gradient fill enabled", "Is the gradient fill feature enabled."},
- {"COLOR", "gradientColor", "0xc0c0c0", "Gradient (2nd fill) color", "Set gradient background color (the other fill color)."},
- {"STRING", "gradientDirection","0", "Gradient direction (angle)", "Direction of the gradient fill."},
- {"BOOLEAN_LIST", "itemShadowCast", "false", "Shadow casting enabled", "Is the shadow casting feature enabled."},
- {"COLOR", "shadowColor", "0xc0c0c0", "Shadow color", "Set shadow color."},
- {"STRING", "shadowThickness", "9", "Shadow thickness/offset", "Thickness/offset of the shadow."},
- {"STRING", "shadowDirection", "45", "Shadow direction (angle)", "Direction of the shadow (angle)."},
- {"BOOLEAN_LIST", "roundCornerRect", "false", "Round rectangle corner enabled","Is rounding of rectangle corner feature enabled."},
- {"STRING", "roundCornerRadius","9", "Round rectangle corner radius","Radius of round rectangle corner."},
- {"STRING", "help", "", "Help URL", "Sets this value to specify the URL containig the help information belonging to the set."},
- {"MULTISTRING", "description", "", "Description", "Free format description of the model element for documentation purposes."},
- {"COMPASS_OPTION", "namePosition", "4", "Name Location", "Sets the name label location relative to the set icon. Eg. North."},
- {"STRING", "nameWrap", "0", "NameWrap number", "Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled."},
- {"BOOLEAN_LIST", "isNameEnabled", "true", "Name enabled", "Displays the name."},
- {"COMPASS_CHECK", "autorouterPref", "neswNESW", "Auto Router Preference", "Sets the allowed stick point of the connections from and to this set."},
- {"BOOLEAN_LIST", "isHotspotEnabled", "true", "Hotspots enabled", "Enables the hotspot feature in connection mode."},
- {"BOOLEAN_LIST", "isTypeShown", "false", "Type displayed", "Displays the type (subtype) if the set is an Instance"},
- {"STRING", "decorator", "", "Decorator", "ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]"},
- {"STRING", "icon", "", "Icon name", "Image(.bmp,.gif) file name to display the set. Icon search paths can be set in File/Settings menu."},
- {"STRING", "porticon", "", "Port icon name", "Specifies the image(.bmp,.gif) file name to display the set if it is a port in a model."},
- {"STRING", "subTypeIcon", "", "Subtype icon name", "Image(.bmp,.gif) file name to display the set if it a subtype. Icon search paths can be set in File/Settings menu."},
- {"STRING", "instanceIcon", "", "Instance icon name", "Image(.bmp,.gif) file name to display the set if it an instance. Icon search paths can be set in File/Settings menu."}
+ {_T("COLOR"), _T("color"), _T("0x000000"), _T("Color"), _T("Set color. Set this value to change the set line color.")},
+ {_T("COLOR"), _T("nameColor"), _T("0x000000"), _T("Name color"), _T("Set name label color. Set this value to change the set name label color.")},
+ {_T("COLOR"), _T("fillColor"), _T("0xFFFFFF"), _T("Fill color"), _T("Set background fill color for the closed models.")},
+ {_T("BOOLEAN_LIST"), _T("gradientFill"), _T("false"), _T("Gradient fill enabled"), _T("Is the gradient fill feature enabled.")},
+ {_T("COLOR"), _T("gradientColor"), _T("0xc0c0c0"), _T("Gradient (2nd fill) color"), _T("Set gradient background color (the other fill color).")},
+ {_T("STRING"), _T("gradientDirection"),_T("0"), _T("Gradient direction (angle)"), _T("Direction of the gradient fill.")},
+ {_T("BOOLEAN_LIST"), _T("itemShadowCast"), _T("false"), _T("Shadow casting enabled"), _T("Is the shadow casting feature enabled.")},
+ {_T("COLOR"), _T("shadowColor"), _T("0xc0c0c0"), _T("Shadow color"), _T("Set shadow color.")},
+ {_T("STRING"), _T("shadowThickness"), _T("9"), _T("Shadow thickness/offset"), _T("Thickness/offset of the shadow.")},
+ {_T("STRING"), _T("shadowDirection"), _T("45"), _T("Shadow direction (angle)"), _T("Direction of the shadow (angle).")},
+ {_T("BOOLEAN_LIST"), _T("roundCornerRect"), _T("false"), _T("Round rectangle corner enabled"),_T("Is rounding of rectangle corner feature enabled.")},
+ {_T("STRING"), _T("roundCornerRadius"),_T("9"), _T("Round rectangle corner radius"),_T("Radius of round rectangle corner.")},
+ {_T("STRING"), _T("help"), _T(""), _T("Help URL"), _T("Sets this value to specify the URL containig the help information belonging to the set.")},
+ {_T("MULTISTRING"), _T("description"), _T(""), _T("Description"), _T("Free format description of the model element for documentation purposes.")},
+ {_T("COMPASS_OPTION"), _T("namePosition"), _T("4"), _T("Name Location"), _T("Sets the name label location relative to the set icon. Eg. North.")},
+ {_T("STRING"), _T("nameWrap"), _T("0"), _T("NameWrap number"), _T("Sets the number of characters in a line of the name. If it is 0, then wrapping is disabled.")},
+ {_T("BOOLEAN_LIST"), _T("isNameEnabled"), _T("true"), _T("Name enabled"), _T("Displays the name.")},
+ {_T("COMPASS_CHECK"), _T("autorouterPref"), _T("neswNESW"), _T("Auto Router Preference"), _T("Sets the allowed stick point of the connections from and to this set.")},
+ {_T("BOOLEAN_LIST"), _T("isHotspotEnabled"), _T("true"), _T("Hotspots enabled"), _T("Enables the hotspot feature in connection mode.")},
+ {_T("BOOLEAN_LIST"), _T("isTypeShown"), _T("false"), _T("Type displayed"), _T("Displays the type (subtype) if the set is an Instance")},
+ {_T("STRING"), _T("decorator"), _T(""), _T("Decorator"), _T("ProgID of an process COM component followed by optional parameters for installing custom drawing code.\r\n Syntax: <ProgID> [<Param1=Value>...<ParamX=ValueX>]")},
+ {_T("STRING"), _T("icon"), _T(""), _T("Icon name"), _T("Image(.bmp,.gif) file name to display the set. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("porticon"), _T(""), _T("Port icon name"), _T("Specifies the image(.bmp,.gif) file name to display the set if it is a port in a model.")},
+ {_T("STRING"), _T("subTypeIcon"), _T(""), _T("Subtype icon name"), _T("Image(.bmp,.gif) file name to display the set if it a subtype. Icon search paths can be set in File/Settings menu.")},
+ {_T("STRING"), _T("instanceIcon"), _T(""), _T("Instance icon name"), _T("Image(.bmp,.gif) file name to display the set if it an instance. Icon search paths can be set in File/Settings menu.")}
};
/***********************************************************************************************************************************************************************************************************************************************************/
@@ -208,7 +208,7 @@
// Get system background color
COLORREF crSysBckg=::GetSysColor(COLOR_WINDOW);
- sprintf(m_szSysBckGrnd,"0x%02x%02x%02x",GetRValue(crSysBckg), GetGValue(crSysBckg), GetBValue(crSysBckg));
+ swprintf(m_szSysBckGrnd, sizeof(m_szSysBckGrnd)/sizeof(m_szSysBckGrnd[0]), _T("0x%02x%02x%02x"),GetRValue(crSysBckg), GetGValue(crSysBckg), GetBValue(crSysBckg));
// Correcting table
m_szModelPreferenceTable[3][2]=m_szSysBckGrnd;
@@ -231,7 +231,7 @@
if(cFlags<1 || cFlags>=32)
{
- ASSERT(("Invalid cFlags parameter SetupPreferences(...)",0));
+ ASSERT((_T("Invalid cFlags parameter SetupPreferences(...)"),0));
return;
}
@@ -353,7 +353,7 @@
// ERROR: wrong cFlags parameter
else
{
- ASSERT(("Invalid cFlags parameter SetupPreferences(...)",0));
+ ASSERT((_T("Invalid cFlags parameter SetupPreferences(...)"),0));
}
}
@@ -445,7 +445,7 @@
CListItem ListItem;
ListItem.bIsContainer=true;
- ListItem.strName="General Preferences";
+ ListItem.strName=_T("General Preferences");
m_ListItemArray.Add(ListItem);
@@ -481,7 +481,7 @@
case OBJTYPE_SET:
cFlag|=PREF_SET;break;
- default: ASSERT(("Invalid MGA object type found creating preference list",FALSE));break;
+ default: ASSERT((_T("Invalid MGA object type found creating preference list"),FALSE));break;
}
}
@@ -581,13 +581,13 @@
if(!bIsAfter)
{
- if(strPath=="srcStyle")
+ if(strPath==_T("srcStyle"))
{
- strName="Connection Preferences";
+ strName=_T("Connection Preferences");
}
- else if((strPath=="autorouterPref" || strPath=="isModelAutoRouted") && !isAutRouterPrefsCategoryAdded)
+ else if((strPath==_T("autorouterPref") || strPath==_T("isModelAutoRouted")) && !isAutRouterPrefsCategoryAdded)
{
- strName="Auto Router Preferences";
+ strName=_T("Auto Router Preferences");
isAutRouterPrefsCategoryAdded = true;
}
else
@@ -670,12 +670,12 @@
else if(lRegNodeStatus==-2) // ATTRSTATUS_INVALID - It does happen.
{
- strRegValue="";
+ strRegValue=_T("");
}
else
{
- ASSERT(("Undocumented(and undesired) MGA feature",false));
+ ASSERT((_T("Undocumented(and undesired) MGA feature"),false));
}
return 0;
}
@@ -727,7 +727,7 @@
}
break;
- default: ASSERT(("Invalid MGA object type found creating preference list",FALSE));break;
+ default: ASSERT((_T("Invalid MGA object type found creating preference list"),FALSE));break;
}
}
@@ -753,27 +753,27 @@
CString strPrefName=(*pTableRow)[1];
- if(strPrefName=="isAutoRouted")
+ if(strPrefName==_T("isAutoRouted"))
{
ListItem.dwUserData=AUTOROUTER_STATE_CONN;
}
- else if(strPrefName=="isModelAutoRouted")
+ else if(strPrefName==_T("isModelAutoRouted"))
{
ListItem.dwUserData=AUTOROUTER_STATE_MODEL;
}
CString strEntryType=(*pTableRow)[0];
- if(strEntryType=="COLOR")
+ if(strEntryType==_T("COLOR"))
{
// Change value format from MGA 0xrrggbb to Windows 0xbbggrr
CString strNewVal;
- char*endptr;
- long l=strtol(strValue,&endptr,16);
- if(*endptr=='\0')
+ TCHAR* endptr;
+ long l = _tcstol(strValue, &endptr, 16);
+ if(*endptr == _T('\0'))
{
- strNewVal.Format("0x%02x%02x%02x",GetRValue(l), GetGValue(l), GetBValue(l));
+ strNewVal.Format(_T("0x%02x%02x%02x"),GetRValue(l), GetGValue(l), GetBValue(l));
}
else
{
@@ -790,14 +790,14 @@
ListItems.Add(ListItem);
}
- else if(strEntryType=="STRING")
+ else if(strEntryType==_T("STRING"))
{
ListItem.Value.SetStringValue(strValue);
ListItem.DefValue.SetStringValue((*pTableRow)[2]);
ListItems.Add(ListItem);
}
- else if(strEntryType=="MULTISTRING")
+ else if(strEntryType==_T("MULTISTRING"))
{
CStringArray strValueArray;
str_split(strValue, strValueArray);
@@ -811,7 +811,7 @@
ListItems.Add(ListItem);
}
- else if(strEntryType=="COMPASS_OPTION")
+ else if(strEntryType==_T("COMPASS_OPTION"))
{
UINT uCompassValue= CCompassData::ParseMgaCompassValueOption(strValue);
ListItem.Value.SetCompassExclValue(uCompassValue);
@@ -821,7 +821,7 @@
ListItems.Add(ListItem);
}
- else if(strEntryType=="COMPASS_CHECK")
+ else if(strEntryType==_T("COMPASS_CHECK"))
{
// Dst: small case; Src: capital
UINT uSrcVal,uDstVal,uSrcDefVal,uDstDefVal;
@@ -833,8 +833,8 @@
// Setting source
ListItemSrc.Value.SetCompassValue(uSrcVal);
ListItemSrc.DefValue.SetCompassValue(uSrcDefVal);
- ListItemSrc.strName+=" (Source)";
- ListItemSrc.strToolTip+=" (Source side)";
+ ListItemSrc.strName+=_T(" (Source)");
+ ListItemSrc.strToolTip+=_T(" (Source side)");
ListItemSrc.dwUserData=AUTOROUTER_SOURCE;
ListItems.Add(ListItemSrc);
@@ -842,20 +842,20 @@
// Setting destination
ListItem.Value.SetCompassValue(uDstVal);
ListItem.DefValue.SetCompassValue(uDstDefVal);
- ListItem.strName+=" (Destination)";
- ListItem.strToolTip+=" (Destination side)";
+ ListItem.strName+=_T(" (Destination)");
+ ListItem.strToolTip+=_T(" (Destination side)");
ListItem.dwUserData=AUTOROUTER_DESTINATION;
ListItems.Add(ListItem);
- // Creating "Miscellaneous Preferences" category
+ // Creating _T("Miscellaneous Preferences") category
CListItem ListItemMisc;
ListItemMisc.bIsContainer=true;
- ListItemMisc.strName="Miscellaneous Preferences";
+ ListItemMisc.strName=_T("Miscellaneous Preferences");
ListItems.Add(ListItemMisc);
}
- else if(strEntryType=="LINE_STYLE_LIST")
+ else if(strEntryType==_T("LINE_STYLE_LIST"))
{
CString strDefValue=(*pTableRow)[2];
CStringArray strArr;
@@ -884,7 +884,7 @@
ListItems.Add(ListItem);
}
- else if(strEntryType=="LINE_TYPE_LIST")
+ else if(strEntryType==_T("LINE_TYPE_LIST"))
{
CString strDefValue=(*pTableRow)[2];
CStringArray strArr;
@@ -914,7 +914,7 @@
}
- else if(strEntryType=="BOOLEAN_LIST")
+ else if(strEntryType==_T("BOOLEAN_LIST"))
{
CString strDefValue=(*pTableRow)[2];
CStringArray strArr;
@@ -948,7 +948,7 @@
}
- else if(strEntryType=="ATTR_LIST")
+ else if(strEntryType==_T("ATTR_LIST"))
{
if(!bIsMultiple)
{
@@ -958,7 +958,7 @@
// Get default value and set it as the first element
CString strTemp=(*pTableRow)[2];
- strArr.Add("");
+ strArr.Add(_T(""));
strLabelArr.Add(strTemp);
int nDefIndex=0;
@@ -983,7 +983,7 @@
strTemp=bstrName;
strLabelArr.Add(strTemp);
- strTemp="%" + strTemp + "%";
+ strTemp=_T("%") + strTemp + _T("%");
strArr.Add(strTemp);
@@ -1009,7 +1009,7 @@
{
// If you created a new type in the tables, add a piece of converter code above
// for it.
- ASSERT(("Unknown preference type has been specified in the preference tables.",0));
+ ASSERT((_T("Unknown preference type has been specified in the preference tables."),0));
}
@@ -1064,7 +1064,7 @@
default:
{
- ASSERT(("Invalid MGA object type found creating preference list",FALSE));break;
+ ASSERT((_T("Invalid MGA object type found creating preference list"),FALSE));break;
}
}
@@ -1101,12 +1101,12 @@
// Hacked by Paka in order to always do something in the project !!!
// If there is nothing in the Project (NOT the MetaProject) to be commited, then the user gets confused
// because the Project does not change and nothing has to be refreshed
- COMTHROW( ccpMgaRegNode->put_Value( CComBSTR( "Dummy" ) ) );
+ COMTHROW( ccpMgaRegNode->put_Value( CComBSTR( _T("Dummy") ) ) );
// Hacked part end
// Delete the registry entries
COMTHROW(ccpMgaRegNode->RemoveTree());
- // For "kind" we set registry values in the meta
+ // For _T("kind") we set registry values in the meta
CComPtr<IMgaMetaFCO> ccpMetaFCO;
COMTHROW(ccpMgaFCO->get_Meta(&ccpMetaFCO));
@@ -1129,7 +1129,7 @@
{
case ITEMDATA_COLOR :
{
- strValue.Format("0x%02x%02x%02x",
+ strValue.Format(_T("0x%02x%02x%02x"),
GetRValue(ListItem.Value.colorVal),
GetGValue(ListItem.Value.colorVal),
GetBValue(ListItem.Value.colorVal));
@@ -1201,7 +1201,7 @@
// Firing the event
if ((ListItem.dwUserData == AUTOROUTER_STATE_CONN ||
ListItem.dwUserData == AUTOROUTER_STATE_MODEL) &&
- strValue == "false")
+ strValue == _T("false"))
{
if (ListItem.dwUserData == AUTOROUTER_STATE_CONN)
pParent->IgnoreNextEvents();
Modified: trunk/GME/ObjectInspector/Preference.h
==============================================================================
--- trunk/GME/ObjectInspector/Preference.h Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/Preference.h Wed Mar 30 13:00:56 2011 (r1221)
@@ -19,15 +19,15 @@
#define PREF_SET 0x10
-typedef char*(*TableRowType)[5];
+typedef TCHAR*(*TableRowType)[5];
class CPreference
{
- static char* m_szConnectionPreferenceTable[][5];
- static char* m_szAtomPreferenceTable[][5];
- static char* m_szModelPreferenceTable[][5];
- static char* m_szProxyPreferenceTable[][5];
- static char* m_szSetPreferenceTable[][5];
+ static TCHAR* m_szConnectionPreferenceTable[][5];
+ static TCHAR* m_szAtomPreferenceTable[][5];
+ static TCHAR* m_szModelPreferenceTable[][5];
+ static TCHAR* m_szProxyPreferenceTable[][5];
+ static TCHAR* m_szSetPreferenceTable[][5];
public:
void WriteItemToMga(CListItem ListItem, const CMgaFCOPtrList& MgaFCOPtrList, bool bIsForKind);
@@ -44,9 +44,9 @@
int FindRegPathInAtomTable(const CString& strPath);
int FindRegPathInConnectionTable(const CString& strPath);
void SetupPreferences(BYTE cFlags);
- static char* m_szLineStyleList[];
- static char* m_szLineTypeList[];
- static char* m_szBooleanList[];
+ static TCHAR* m_szLineStyleList[];
+ static TCHAR* m_szLineTypeList[];
+ static TCHAR* m_szBooleanList[];
CArray<CListItem,CListItem&> m_ListItemArray;
void CreateList( const CMgaFCOPtrList& MgaFCOPtrList);
@@ -65,7 +65,7 @@
int nSetTableLength;
// Helper for System Backround Color
- char m_szSysBckGrnd[9];
+ TCHAR m_szSysBckGrnd[9];
// Helper variable for placing auto router switch settings in case of model preferences
bool isAutRouterPrefsCategoryAdded;
Modified: trunk/GME/ObjectInspector/Property.cpp
==============================================================================
--- trunk/GME/ObjectInspector/Property.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/Property.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -62,11 +62,11 @@
void CProperty::CreateGeneralList(const CMgaFCOPtrList& MgaFCOPtrList,const CMgaFolderPtrList& MgaFolderPtrList,CArray<CListItem,CListItem&> &ListItemArray)
{
- // Adding "General Properties" container
+ // Adding _T("General Properties") container
CListItem GeneralListItem;
GeneralListItem.bIsReadOnly=true;
GeneralListItem.bIsContainer=true;
- GeneralListItem.strName="General Properties";
+ GeneralListItem.strName=_T("General Properties");
ListItemArray.Add(GeneralListItem);
@@ -132,16 +132,16 @@
// Type
ListItem.bIsDifferentValue=bIsTypeDirty;
- ListItem.strName="Type";
- ListItem.strToolTip="Type of the object.";
+ ListItem.strName=_T("Type");
+ ListItem.strToolTip=_T("Type of the object.");
ListItem.Value.SetStringValue(strType);
ListItemArray.Add(ListItem);
// Kind
ListItem.bIsDifferentValue=bIsKindNameDirty;
- ListItem.strName="Kind";
- ListItem.strToolTip="Kind of the object.";
+ ListItem.strName=_T("Kind");
+ ListItem.strToolTip=_T("Kind of the object.");
ListItem.Value.SetStringValue(strKindName);
ListItemArray.Add(ListItem);
@@ -150,30 +150,30 @@
if(!bIsMultiple)
{
ListItem.bIsDifferentValue=false;
- ListItem.strName="Object ID";
- ListItem.strToolTip="Unique ID of the object.";
+ ListItem.strName=_T("Object ID");
+ ListItem.strToolTip=_T("Unique ID of the object.");
ListItem.Value.SetStringValue(strObjectID);
ListItemArray.Add(ListItem);
ListItem.bIsDifferentValue=false;
- ListItem.strName="Relative ID";
- ListItem.strToolTip="Relative ID of the object, corresponds with creation order. The object with greater relative ID was created later.";
+ ListItem.strName=_T("Relative ID");
+ ListItem.strToolTip=_T("Relative ID of the object, corresponds with creation order. The object with greater relative ID was created later.");
ListItem.Value.SetStringValue(strRelID);
ListItemArray.Add(ListItem);
ListItem.bIsDifferentValue=false;
- ListItem.strName="Meta ID";
- ListItem.strToolTip="Meta ID of the object.";
+ ListItem.strName=_T("Meta ID");
+ ListItem.strToolTip=_T("Meta ID of the object.");
ListItem.Value.SetStringValue(strMetaID);
ListItemArray.Add(ListItem);
ListItem.bIsDifferentValue=false;
- ListItem.strName="GUID";
- ListItem.strToolTip="Universally unique ID of the object.";
+ ListItem.strName=_T("GUID");
+ ListItem.strToolTip=_T("Universally unique ID of the object.");
ListItem.Value.SetStringValue(strGUID);
ListItemArray.Add(ListItem);
@@ -190,7 +190,7 @@
bool bIsFirst)
{
- static CString strTypeNameArray[] = { "Invalid", "Model", "Atom", "Reference", "Connection", "Set", "Folder" };
+ static CString strTypeNameArray[] = { _T("Invalid"), _T("Model"), _T("Atom"), _T("Reference"), _T("Connection"), _T("Set"), _T("Folder") };
CString strTemp;
objtype_enum oeObjType;
COMTHROW(ccpMgaObject->get_ObjType(&oeObjType));
@@ -232,16 +232,16 @@
// If it is an instance
if(vtbIsInstance != VARIANT_FALSE)
{
- strTemp.Format("%s (instance of %s)",strTypeNameArray[oeObjType],baseName);
+ strTemp.Format(_T("%s (instance of %s)"),strTypeNameArray[oeObjType],baseName);
}
else
{
- strTemp.Format("%s (subtype of %s)",strTypeNameArray[oeObjType],baseName);
+ strTemp.Format(_T("%s (subtype of %s)"),strTypeNameArray[oeObjType],baseName);
}
}
else // Archetype
{
- strTemp.Format("%s (Archetype)",strTypeNameArray[oeObjType]);
+ strTemp.Format(_T("%s (Archetype)"),strTypeNameArray[oeObjType]);
}
}
else
@@ -264,7 +264,7 @@
///////////////// Kind ////////////////////////////////////
// Getting kind
- strTemp = "N/A";
+ strTemp = _T("N/A");
// Get Meta
CComPtr<IMgaMetaBase> ccpMetaBase;
@@ -293,18 +293,18 @@
// Querying ObjectID
CComBSTR bstrObjectID;
COMTHROW(ccpMgaObject->get_ID(&bstrObjectID));
- strObjectID.Format("%s",CString(bstrObjectID));
+ strObjectID.Format(_T("%s"),CString(bstrObjectID));
// Getting RelID (this carries the creation order of an MgaObject)
long lRelID;
COMTHROW(ccpMgaObject->get_RelID(&lRelID));
- strRelID.Format("0x%08X",lRelID);
+ strRelID.Format(_T("0x%08X"),lRelID);
// Get Meta ID
metaref_type mtMetaID = 0;
COMTHROW(ccpMetaBase->get_MetaRef(&mtMetaID));
- strMetaID.Format("%ld",(long)mtMetaID);
+ strMetaID.Format(_T("%ld"),(long)mtMetaID);
// Get GUID
CComBSTR bstrGUID;
@@ -318,11 +318,11 @@
void CProperty::CreateFCOList(const CMgaFCOPtrList& MgaFCOPtrList,CArray<CListItem,CListItem&> &ListItemArray)
{
- // Adding "FCO Properties" container
+ // Adding _T("FCO Properties") container
CListItem FCOListItem;
FCOListItem.bIsContainer=true;
FCOListItem.bIsReadOnly=true;
- FCOListItem.strName="FCO Properties";
+ FCOListItem.strName=_T("FCO Properties");
ListItemArray.Add(FCOListItem);
@@ -346,7 +346,7 @@
CComPtr<IMgaMetaRole> ccpMetaRole;
COMTHROW(ccpMgaFCO->get_MetaRole(&ccpMetaRole));
- strTemp = "N/A";
+ strTemp = _T("N/A");
if(ccpMetaRole != 0)
{
CComBSTR bstrRoleName;
@@ -407,7 +407,7 @@
if (!bFirst)
{
- strTemp += "; ";
+ strTemp += _T("; ");
}
else
{
@@ -431,7 +431,7 @@
if (vbtIsPrimary != VARIANT_FALSE)
{
- strTemp += " (Primary)";
+ strTemp += _T(" (Primary)");
}
}
MGACOLL_ITERATE_END;
@@ -460,16 +460,16 @@
// Role
ListItem.bIsDifferentValue=bIsRoleDirty;
- ListItem.strName="Role";
- ListItem.strToolTip="Role name of the FCO.";
+ ListItem.strName=_T("Role");
+ ListItem.strToolTip=_T("Role name of the FCO.");
ListItem.Value.SetStringValue(strRole);
ListItemArray.Add(ListItem);
// Aspect
ListItem.bIsDifferentValue=bIsAspectDirty;
- ListItem.strName="Aspect";
- ListItem.strToolTip="Aspects which this FCO contains.";
+ ListItem.strName=_T("Aspect");
+ ListItem.strToolTip=_T("Aspects which this FCO contains.");
ListItem.Value.SetStringValue(strAspect);
ListItemArray.Add(ListItem);
@@ -481,12 +481,12 @@
void CProperty::CreateMarsList(const CMgaFCOPtrList& MgaFCOPtrList,CArray<CListItem,CListItem&> &ListItemArray)
{
- // Adding "MARS Properties" container
+ // Adding _T("MARS Properties") container
CListItem MarsListItem;
MarsListItem.bIsContainer=true;
MarsListItem.bIsReadOnly=true;
- MarsListItem.strName="MARS Properties";
- MarsListItem.strToolTip="Common properties for M(odel),A(tom),R(eference),S(et) model elements";
+ MarsListItem.strName=_T("MARS Properties");
+ MarsListItem.strToolTip=_T("Common properties for M(odel),A(tom),R(eference),S(et) model elements");
ListItemArray.Add(MarsListItem);
@@ -509,7 +509,7 @@
/////////////////////////////// Dependency //////////////////////////////////
- strTemp="N/A";
+ strTemp=_T("N/A");
CComPtr<IMgaFCO> ccpAncestorFCO;
COMTHROW(ccpMgaFCO->get_DerivedFrom(&ccpAncestorFCO));
if(ccpAncestorFCO)
@@ -522,11 +522,11 @@
COMTHROW(ccpMgaDependReference->CompareToBase(&wDepends));
if(wDepends > 0)
{
- strTemp="False";
+ strTemp=_T("False");
}
else
{
- strTemp="True";
+ strTemp=_T("True");
}
}
else
@@ -537,11 +537,11 @@
COMTHROW(ccpMgaSet->CompareToBase(&wDepends));
if(wDepends > 0)
{
- strTemp="False";
+ strTemp=_T("False");
}
else
{
- strTemp="True";
+ strTemp=_T("True");
}
}
}
@@ -561,7 +561,7 @@
//////////////////////////////// Referece ////////////////////////////////
- strTemp="N/A";
+ strTemp=_T("N/A");
CComPtr<IMgaReference> ccpMgaReference;
if(ccpMgaFCO.QueryInterface(&ccpMgaReference) == S_OK) // If FCO is a reference
{
@@ -583,11 +583,11 @@
CComBSTR bstrMetaReferredName;
COMTHROW(ccpMetaReferredFCO->get_DisplayedName(&bstrMetaReferredName));
- strTemp.Format(" %s (%s, ObjectID=%s)",CString(bstrReferredName),CString(bstrMetaReferredName),CString(bstrReferredID));
+ strTemp.Format(_T(" %s (%s, ObjectID=%s)"),CString(bstrReferredName),CString(bstrMetaReferredName),CString(bstrReferredID));
}
else // NULL reference
{
- strTemp="<Null reference>";
+ strTemp=_T("<Null reference>");
}
}
@@ -613,16 +613,16 @@
// Depends
ListItem.bIsDifferentValue=bIsDependsDirty;
- ListItem.strName="Depends";
- ListItem.strToolTip="Dependencies of the FCO.";
+ ListItem.strName=_T("Depends");
+ ListItem.strToolTip=_T("Dependencies of the FCO.");
ListItem.Value.SetStringValue(strDepends);
ListItemArray.Add(ListItem);
// Refers
ListItem.bIsDifferentValue=bIsRefersDirty;
- ListItem.strName="References";
- ListItem.strToolTip="FCO to which this reference refers.";
+ ListItem.strName=_T("References");
+ ListItem.strToolTip=_T("FCO to which this reference refers.");
ListItem.Value.SetStringValue(strRefers);
ListItemArray.Add(ListItem);
@@ -634,11 +634,11 @@
void CProperty::CreateConnectionList(const CMgaFCOPtrList& MgaFCOPtrList,CArray<CListItem,CListItem&> &ListItemArray)
{
- // Adding "Connection Properties" container
+ // Adding _T("Connection Properties") container
CListItem ConnListItem;
ConnListItem.bIsContainer=true;
ConnListItem.bIsReadOnly=true;
- ConnListItem.strName="Connection Properties";
+ ConnListItem.strName=_T("Connection Properties");
ListItemArray.Add(ConnListItem);
@@ -738,8 +738,8 @@
if (vtbIsParentsEqual != VARIANT_FALSE) // If parents are equal
{
- strSrcPortName ="-";
- strDstPortName ="-";
+ strSrcPortName =_T("-");
+ strDstPortName =_T("-");
}
else
{
@@ -781,32 +781,32 @@
// strSource
ListItem.bIsDifferentValue=bIsSourceDirty;
- ListItem.strName="Source";
- ListItem.strToolTip="Connection source side.";
+ ListItem.strName=_T("Source");
+ ListItem.strToolTip=_T("Connection source side.");
ListItem.Value.SetStringValue(strSource);
ListItemArray.Add(ListItem);
// strSourcePort
ListItem.bIsDifferentValue=bIsSourcePortDirty;
- ListItem.strName="Source Port";
- ListItem.strToolTip="Connection source side port.";
+ ListItem.strName=_T("Source Port");
+ ListItem.strToolTip=_T("Connection source side port.");
ListItem.Value.SetStringValue(strSourcePort);
ListItemArray.Add(ListItem);
// strDest
ListItem.bIsDifferentValue=bIsDestDirty;
- ListItem.strName="Destination";
- ListItem.strToolTip="Connection destination side.";
+ ListItem.strName=_T("Destination");
+ ListItem.strToolTip=_T("Connection destination side.");
ListItem.Value.SetStringValue(strDest);
ListItemArray.Add(ListItem);
// strSourcePort
ListItem.bIsDifferentValue=bIsDestPortDirty;
- ListItem.strName="Destination Port";
- ListItem.strToolTip="Connection destination side port.";
+ ListItem.strName=_T("Destination Port");
+ ListItem.strToolTip=_T("Connection destination side port.");
ListItem.Value.SetStringValue(strDestPort);
ListItemArray.Add(ListItem);
@@ -817,11 +817,11 @@
void CProperty::CreateFolderList(const CMgaFolderPtrList& MgaFolderPtrList,CArray<CListItem,CListItem&> &ListItemArray)
{
- // Adding "Folder Properties" container
+ // Adding _T("Folder Properties") container
CListItem FolderListItem;
FolderListItem.bIsContainer=true;
FolderListItem.bIsReadOnly=true;
- FolderListItem.strName="Folder Properties";
+ FolderListItem.strName=_T("Folder Properties");
ListItemArray.Add(FolderListItem);
@@ -865,8 +865,8 @@
ListItem.bIsReadOnly=true;
// strLibraryRef
ListItem.bIsDifferentValue=bIsLibraryRefDirty;
- ListItem.strName="Library Name";
- ListItem.strToolTip="Library is a folder incorporating an MGA file using the same paradigm as meta.";
+ ListItem.strName=_T("Library Name");
+ ListItem.strToolTip=_T("Library is a folder incorporating an MGA file using the same paradigm as meta.");
ListItem.Value.SetStringValue(strLibraryRef);
ListItemArray.Add(ListItem);
Modified: trunk/GME/ObjectInspector/SplitterBar.cpp
==============================================================================
--- trunk/GME/ObjectInspector/SplitterBar.cpp Wed Mar 30 12:55:19 2011 (r1220)
+++ trunk/GME/ObjectInspector/SplitterBar.cpp Wed Mar 30 13:00:56 2011 (r1221)
@@ -42,7 +42,7 @@
{
CWnd* pWnd = this;
m_bHorizontal=bHorizontal;
- return pWnd->Create(NULL, "", dwStyle, rect, pParentWnd, nID);
+ return pWnd->Create(NULL, _T(""), dwStyle, rect, pParentWnd, nID);
}
/////////////////////////////////////////////////////////////////////////////
More information about the gme-commit
mailing list