rtoss

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/GreenPad-nt31/ @ 119  →  /GreenPad-nt31/ @ 120
/GreenPad-nt31/editwing/ip_view.h
@@ -74,7 +74,11 @@
int Wc( unicode ch ) const
{
if( widthTable_[ ch ] == -1 )
#ifdef WIN32S
::GetCharWidthA( dc_, ch, ch, widthTable_+ch );
#else
::GetCharWidthW( dc_, ch, ch, widthTable_+ch );
#endif
return widthTable_[ ch ];
}
int W( const unicode* pch ) const // 1.08 ƒTƒƒQ[ƒgƒyƒA‰ñ”ð
@@ -88,10 +92,18 @@
if( ::GetTextExtentPoint32W( dc_, pch, 2, &sz ) )
return sz.cx;
int w = 0;
#ifdef WIN32S
::GetCharWidthA( dc_, ch, ch, &w );
#else
::GetCharWidthW( dc_, ch, ch, &w );
#endif
return w;
}
#ifdef WIN32S
::GetCharWidthA( dc_, ch, ch, widthTable_+ch );
#else
::GetCharWidthW( dc_, ch, ch, widthTable_+ch );
#endif
}
return widthTable_[ ch ];
}
/GreenPad-nt31/editwing/ip_draw.cpp
@@ -260,15 +260,11 @@
inline void Painter::CharOut( unicode ch, int x, int y )
{
#ifdef WIN32S
DWORD dwNum = WideCharToMultiByte(CP_ACP,NULL,&ch,-1,NULL,0,NULL,FALSE);
DWORD dwNum;
char *psText;
psText = new char[dwNum];
if(!psText)
if(dwNum = WideCharToMultiByte(CP_ACP,NULL,&ch,-1,NULL,0,NULL,FALSE))
{
delete []psText;
}
else
{
psText = new char[dwNum];
WideCharToMultiByte(CP_ACP,NULL,&ch,-1,psText,dwNum,NULL,FALSE);
::TextOutA( dc_, x, y, psText, dwNum-1 );
delete []psText;
@@ -282,15 +278,11 @@
( const unicode* str, int len, int x, int y )
{
#ifdef WIN32S
DWORD dwNum = WideCharToMultiByte(CP_ACP,NULL,str,-1,NULL,0,NULL,FALSE);
DWORD dwNum;
char *psText;
psText = new char[dwNum];
if(!psText)
if(dwNum = WideCharToMultiByte(CP_ACP,NULL,str,-1,NULL,0,NULL,FALSE))
{
delete []psText;
}
else
{
psText = new char[dwNum];
WideCharToMultiByte(CP_ACP,NULL,str,-1,psText,dwNum,NULL,FALSE);
::TextOutA( dc_, x, y, psText, dwNum-1 );
delete []psText;
/GreenPad-nt31/kilib_vc71.vcproj
@@ -354,7 +354,7 @@
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="1">
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"