Subversion Repositories spk

Rev

Rev 191 | Rev 242 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 191 Rev 197
Line 117... Line 117...
117 
	return Str;
 117 
	return Str;
118 
}
 118 
}
119 
 
 119 
 
120 
inline System::Drawing::Bitmap ^LoadIcon(CBaseFile *p)
 120 
inline System::Drawing::Bitmap ^LoadIcon(CBaseFile *p)
121 
{
 121 
{
122 
	Utils::String file = p->icon()->filePointer();
 122 
	Utils::WString file = p->icon()->filePointer();
123 
	if (!file.empty())
 123 
	if (!file.empty())
124 
	{
 124 
	{
125 
		file = file.findReplace("/", "\\").findReplace("\\\\", "\\");
 125 
		file = file.findReplace(L"/", L"\\").findReplace(L"\\\\", L"\\");
126 
		bool doIcon = false;
 126 
		bool doIcon = false;
127 
		System::String ^sFile = _US(file);
 127 
		System::String ^sFile = _US(file);
128 
		if ( System::IO::File::Exists(sFile) )
 128 
		if ( System::IO::File::Exists(sFile) )
129 
		{
 129 
		{
130 
			Bitmap ^myBitmap = gcnew Bitmap(sFile);
 130 
			Bitmap ^myBitmap = gcnew Bitmap(sFile);
Line 135... Line 135...
135 
	return nullptr;
 135 
	return nullptr;
136 
}
 136 
}
137 
 
 137 
 
138 
inline System::String ^GetProgramVersionString(float version, int beta)
 138 
inline System::String ^GetProgramVersionString(float version, int beta)
139 
{
 139 
{
140 
	System::String ^str = "V" + _US(Utils::String::FromFloat(version, 2));
 140 
	System::String ^str = "V" + _US(Utils::WString::FromFloat(version, 2));
141 
	// beta version
 141 
	// beta version
142 
	if ( beta > 0 )
 142 
	if ( beta > 0 )
143 
		str += " (Beta " + beta + ")";
 143 
		str += " (Beta " + beta + ")";
144 
	// RC release
 144 
	// RC release
145 
	else if ( beta < 0 )
 145 
	else if ( beta < 0 )