rtoss

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/GreenPad-nt31/ @ 117  →  /GreenPad-nt31/ @ 118
/GreenPad-nt31/editwing/ip_draw.cpp
@@ -221,7 +221,11 @@
 
// •¶Žš•ƒe[ƒuƒ‹‰Šú‰»iASCII”͈͂̕¶ŽšˆÈŠO‚Í’x‰„ˆ—j
memFF( widthTable_, 65536*sizeof(int) );
#ifdef WIN32S
::GetCharWidthA( dc_, ' ', '~', widthTable_+' ' );
#else
::GetCharWidthW( dc_, L' ', L'~', widthTable_+L' ' );
#endif
widthTable_[L'\t'] = W() * Max(1,vc.tabstep);
// ‰ºˆÊƒTƒƒQ[ƒg‚Í•¶Žš•ƒ[ƒ
mem00( widthTable_+0xDC00, (0xE000 - 0xDC00)*sizeof(int) );
@@ -255,13 +259,39 @@
 
inline void Painter::CharOut( unicode ch, int x, int y )
{
#ifdef WIN32S
DWORD dwNum = WideCharToMultiByte(CP_ACP,NULL,&ch,-1,NULL,0,NULL,FALSE);
char *psText;
psText = new char[dwNum];
if(!psText)
{
delete []psText;
}
WideCharToMultiByte(CP_ACP,NULL,&ch,-1,psText,dwNum,NULL,FALSE);
::TextOutA( dc_, x, y, psText, 1 );
delete []psText;
#else
::TextOutW( dc_, x, y, &ch, 1 );
#endif
}
 
inline void Painter::StringOut
( const unicode* str, int len, int x, int y )
{
#ifdef WIN32S
DWORD dwNum = WideCharToMultiByte(CP_ACP,NULL,str,-1,NULL,0,NULL,FALSE);
char *psText;
psText = new char[dwNum];
if(!psText)
{
delete []psText;
}
WideCharToMultiByte(CP_ACP,NULL,str,-1,psText,dwNum,NULL,FALSE);
::TextOutA( dc_, x, y, psText, dwNum );
delete []psText;
#else
::TextOutW( dc_, x, y, str, len );
#endif
}
 
inline void Painter::SetColor( int i )
/GreenPad-nt31/kilib_vc71.sln
@@ -9,6 +9,7 @@
Debug = Debug
Release = Release
Unicode Release = Unicode Release
Win32s Release = Win32s Release
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
@@ -19,6 +20,8 @@
{910E868F-4E52-4D55-9C4E-4563F5934517}.Release.Build.0 = Release|Win32
{910E868F-4E52-4D55-9C4E-4563F5934517}.Unicode Release.ActiveCfg = Unicode Release|Win32
{910E868F-4E52-4D55-9C4E-4563F5934517}.Unicode Release.Build.0 = Unicode Release|Win32
{910E868F-4E52-4D55-9C4E-4563F5934517}.Win32s Release.ActiveCfg = Win32s Release|Win32
{910E868F-4E52-4D55-9C4E-4563F5934517}.Win32s Release.Build.0 = Win32s Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
/GreenPad-nt31/kilib_vc71.vcproj
@@ -194,7 +194,7 @@
EnableFiberSafeOptimizations="TRUE"
WholeProgramOptimization="FALSE"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,SUPERTINY,USE_ORIGINAL_MEMMAN,USEGLOBALIME"
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,SUPERTINY,USE_ORIGINAL_MEMMAN"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="0"
@@ -217,7 +217,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /merge:.rdata=.text"
AdditionalOptions="/MACHINE:I386 /SUBSYSTEM:WINDOWS,3.10 /FIXED:NO"
AdditionalDependencies="kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib comctl32.lib comdlg32.lib ole32.lib advapi32.lib imm32.lib uuid.lib"
OutputFile="release/GreenPad.exe"
LinkIncremental="1"
@@ -227,7 +227,7 @@
ProgramDatabaseFile=".\release/GreenPad.pdb"
GenerateMapFile="TRUE"
MapFileName=".\OBJ/vc71/rel/GreenPad.map"
SubSystem="2"
SubSystem="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
@@ -261,6 +261,92 @@
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Win32s Release|Win32"
OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2"
WholeProgramOptimization="TRUE">
<Tool
Name="VCCLCompilerTool"
Optimization="3"
InlineFunctionExpansion="1"
EnableIntrinsicFunctions="TRUE"
FavorSizeOrSpeed="2"
OmitFramePointers="TRUE"
EnableFiberSafeOptimizations="TRUE"
WholeProgramOptimization="FALSE"
AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,SUPERTINY,USE_ORIGINAL_MEMMAN,WIN32S"
StringPooling="TRUE"
ExceptionHandling="FALSE"
RuntimeLibrary="0"
StructMemberAlignment="0"
BufferSecurityCheck="FALSE"
EnableFunctionLevelLinking="TRUE"
TreatWChar_tAsBuiltInType="TRUE"
RuntimeTypeInfo="FALSE"
UsePrecompiledHeader="1"
PrecompiledHeaderThrough="stdafx.h"
PrecompiledHeaderFile=".\OBJ/vc71/rel/kilib.pch"
AssemblerListingLocation=".\OBJ/vc71/rel/"
ObjectFile=".\OBJ/vc71/rel/"
ProgramDataBaseFileName=".\OBJ/vc71/rel/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="0"
CallingConvention="1"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386 /SUBSYSTEM:WINDOWS,3.10 /FIXED:NO"
AdditionalDependencies="kernel32.lib user32.lib comctl32.lib shell32.lib gdi32.lib comctl32.lib comdlg32.lib ole32.lib advapi32.lib imm32.lib uuid.lib"
OutputFile="release/GreenPad.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreAllDefaultLibraries="TRUE"
GenerateDebugInformation="FALSE"
ProgramDatabaseFile=".\release/GreenPad.pdb"
GenerateMapFile="TRUE"
MapFileName=".\OBJ/vc71/rel/GreenPad.map"
SubSystem="0"
OptimizeReferences="2"
EnableCOMDATFolding="2"
OptimizeForWindows98="1"
LinkTimeCodeGeneration="FALSE"
EntryPointSymbol=""/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\release/kilib.tlb"/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1041"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
@@ -379,6 +465,14 @@
EnableIntrinsicFunctions="FALSE"
WholeProgramOptimization="FALSE"/>
</FileConfiguration>
<FileConfiguration
Name="Win32s Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="1"
EnableIntrinsicFunctions="FALSE"
WholeProgramOptimization="FALSE"/>
</FileConfiguration>
</File>
<File
RelativePath=".\kilib\path.cpp">
@@ -409,6 +503,13 @@
EnableIntrinsicFunctions="TRUE"
UsePrecompiledHeader="1"/>
</FileConfiguration>
<FileConfiguration
Name="Win32s Release|Win32">
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="TRUE"
UsePrecompiledHeader="1"/>
</FileConfiguration>
</File>
<File
RelativePath=".\kilib\string.cpp">