mirror of https://github.com/PCSX2/pcsx2.git
wxWidgets3.0: upgrade from 3.0.1 to 3.0.2
This commit is contained in:
parent
24d5e59c32
commit
9a9e93da83
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -546,30 +546,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
||||||
|
@ -577,38 +561,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
||||||
|
|
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -627,30 +627,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\apptbase.h" />
|
<ClInclude Include="..\..\include\wx\msw\apptbase.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\apptrait.h" />
|
<ClInclude Include="..\..\include\wx\msw\apptrait.h" />
|
||||||
|
@ -662,38 +646,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\fswatcher.h" />
|
<ClInclude Include="..\..\include\wx\msw\fswatcher.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\gccpriv.h" />
|
<ClInclude Include="..\..\include\wx\msw\gccpriv.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\libraries.h" />
|
<ClInclude Include="..\..\include\wx\msw\libraries.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\mimetype.h" />
|
<ClInclude Include="..\..\include\wx\msw\mimetype.h" />
|
||||||
|
|
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -1123,30 +1123,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\accel.h" />
|
<ClInclude Include="..\..\include\wx\msw\accel.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\ole\access.h" />
|
<ClInclude Include="..\..\include\wx\msw\ole\access.h" />
|
||||||
|
@ -1200,38 +1184,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\gauge.h" />
|
<ClInclude Include="..\..\include\wx\msw\gauge.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\gdiimage.h" />
|
<ClInclude Include="..\..\include\wx\msw\gdiimage.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\glcanvas.h" />
|
<ClInclude Include="..\..\include\wx\msw\glcanvas.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\headerctrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\headerctrl.h" />
|
||||||
|
|
|
@ -0,0 +1,237 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Debug|Win32">
|
||||||
|
<Configuration>DLL Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Debug|x64">
|
||||||
|
<Configuration>DLL Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Release|Win32">
|
||||||
|
<Configuration>DLL Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Release|x64">
|
||||||
|
<Configuration>DLL Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>_custom_build</ProjectName>
|
||||||
|
<ProjectGuid>{01F4CE10-2CFB-41A8-B41F-E54337868A1D}</ProjectGuid>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Utility</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v110</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets">
|
||||||
|
<Import Project="wx_vc11_wx_setup.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Setup Headers">
|
||||||
|
<UniqueIdentifier>{63537534-1833-5C1F-8DBD-359A84F294C8}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="MSW Headers">
|
||||||
|
<UniqueIdentifier>{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
|
<Filter>Setup Headers</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
|
<Filter>MSW Headers</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -546,30 +546,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
<ClInclude Include="..\..\include\wx\msw\bmpcbox.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\calctrl.h" />
|
||||||
|
@ -577,38 +561,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\datectrl.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\datetimectrl.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
<ClInclude Include="..\..\include\wx\msw\hyperlink.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
<ClInclude Include="..\..\include\wx\msw\joystick.h" />
|
||||||
|
|
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -627,30 +627,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\apptbase.h" />
|
<ClInclude Include="..\..\include\wx\msw\apptbase.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\apptrait.h" />
|
<ClInclude Include="..\..\include\wx\msw\apptrait.h" />
|
||||||
|
@ -662,38 +646,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\fswatcher.h" />
|
<ClInclude Include="..\..\include\wx\msw\fswatcher.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\gccpriv.h" />
|
<ClInclude Include="..\..\include\wx\msw\gccpriv.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\libraries.h" />
|
<ClInclude Include="..\..\include\wx\msw\libraries.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\mimetype.h" />
|
<ClInclude Include="..\..\include\wx\msw\mimetype.h" />
|
||||||
|
|
|
@ -284,7 +284,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -450,7 +450,7 @@
|
||||||
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
<ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
|
||||||
<WarningLevel>Level4</WarningLevel>
|
<WarningLevel>Level4</WarningLevel>
|
||||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||||
<DebugInformationFormat>None</DebugInformationFormat>
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||||
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||||
|
@ -1123,30 +1123,14 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\accel.h" />
|
<ClInclude Include="..\..\include\wx\msw\accel.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\ole\access.h" />
|
<ClInclude Include="..\..\include\wx\msw\ole\access.h" />
|
||||||
|
@ -1200,38 +1184,14 @@
|
||||||
<ClInclude Include="..\..\include\wx\msw\gauge.h" />
|
<ClInclude Include="..\..\include\wx\msw\gauge.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\gdiimage.h" />
|
<ClInclude Include="..\..\include\wx\msw\gdiimage.h" />
|
||||||
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</ExcludedFromBuild>
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
|
||||||
</CustomBuild>
|
</CustomBuild>
|
||||||
<ClInclude Include="..\..\include\wx\msw\glcanvas.h" />
|
<ClInclude Include="..\..\include\wx\msw\glcanvas.h" />
|
||||||
<ClInclude Include="..\..\include\wx\msw\headerctrl.h" />
|
<ClInclude Include="..\..\include\wx\msw\headerctrl.h" />
|
||||||
|
|
|
@ -0,0 +1,237 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Debug|Win32">
|
||||||
|
<Configuration>DLL Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Debug|x64">
|
||||||
|
<Configuration>DLL Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Release|Win32">
|
||||||
|
<Configuration>DLL Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="DLL Release|x64">
|
||||||
|
<Configuration>DLL Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectName>_custom_build</ProjectName>
|
||||||
|
<ProjectGuid>{01F4CE10-2CFB-41A8-B41F-E54337868A1D}</ProjectGuid>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Utility</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
|
<UseOfMfc>false</UseOfMfc>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
<PlatformToolset>v120</PlatformToolset>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets">
|
||||||
|
<Import Project="wx_vc12_wx_setup.props" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</LinkIncremental>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</LinkIncremental>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">true</GenerateManifest>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">true</GenerateManifest>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxOutDir)</OutDir>
|
||||||
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxOutDir)</OutDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxIntRootDir)$(ProjectName)\</IntDir>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">false</LinkIncremental>
|
||||||
|
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">false</LinkIncremental>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">true</GenerateManifest>
|
||||||
|
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">true</GenerateManifest>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(wxToolkitLibNamePrefix)$(ProjectName)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix)</TargetName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs)</Outputs>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h</Message>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h"</Command>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs)</Outputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs)</AdditionalInputs>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
|
@ -0,0 +1,19 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Setup Headers">
|
||||||
|
<UniqueIdentifier>{63537534-1833-5C1F-8DBD-359A84F294C8}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="MSW Headers">
|
||||||
|
<UniqueIdentifier>{5AFFF20E-29F9-512B-B80A-7DC45976CDAC}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\setup.h">
|
||||||
|
<Filter>Setup Headers</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
<CustomBuild Include="..\..\include\wx\msw\genrcdefs.h">
|
||||||
|
<Filter>MSW Headers</Filter>
|
||||||
|
</CustomBuild>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
|
@ -516,7 +516,7 @@ protected:
|
||||||
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
|
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(__UNIX__) && !defined(__WXMSW__)
|
#if defined(__UNIX__) && !defined(__WINDOWS__)
|
||||||
#include "wx/unix/app.h"
|
#include "wx/unix/app.h"
|
||||||
#else
|
#else
|
||||||
// this has to be a class and not a typedef as we forward declare it
|
// this has to be a class and not a typedef as we forward declare it
|
||||||
|
|
|
@ -364,7 +364,10 @@ protected:
|
||||||
void Copy(const wxArrayString& src); // copies the contents of another array
|
void Copy(const wxArrayString& src); // copies the contents of another array
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void Grow(size_t nIncrement = 0); // makes array bigger if needed
|
// Allocate the new buffer big enough to hold m_nCount + nIncrement items and
|
||||||
|
// return the pointer to the old buffer, which must be deleted by the caller
|
||||||
|
// (if the old buffer is big enough, just return NULL).
|
||||||
|
wxString *Grow(size_t nIncrement);
|
||||||
|
|
||||||
size_t m_nSize, // current size of the array
|
size_t m_nSize, // current size of the array
|
||||||
m_nCount; // current number of elements
|
m_nCount; // current number of elements
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#if wxUSE_BITMAPCOMBOBOX
|
#if wxUSE_BITMAPCOMBOBOX
|
||||||
|
|
||||||
#include "wx/bitmap.h"
|
#include "wx/bitmap.h"
|
||||||
|
#include "wx/dynarray.h"
|
||||||
|
|
||||||
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
class WXDLLIMPEXP_FWD_CORE wxWindow;
|
||||||
class WXDLLIMPEXP_FWD_CORE wxItemContainer;
|
class WXDLLIMPEXP_FWD_CORE wxItemContainer;
|
||||||
|
|
|
@ -54,13 +54,16 @@
|
||||||
#if defined(__GXX_ABI_VERSION)
|
#if defined(__GXX_ABI_VERSION)
|
||||||
#define __WX_BO_COMPILER \
|
#define __WX_BO_COMPILER \
|
||||||
",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
|
",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
|
||||||
#elif defined(__INTEL_COMPILER)
|
|
||||||
#define __WX_BO_COMPILER ",Intel C++"
|
|
||||||
#elif defined(__GNUG__)
|
#elif defined(__GNUG__)
|
||||||
#define __WX_BO_COMPILER ",GCC " \
|
#define __WX_BO_COMPILER ",GCC " \
|
||||||
__WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
|
__WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
|
||||||
#elif defined(__VISUALC__)
|
#elif defined(__VISUALC__)
|
||||||
#define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER)
|
#define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER)
|
||||||
|
#elif defined(__INTEL_COMPILER)
|
||||||
|
// Notice that this must come after MSVC check as ICC under Windows is
|
||||||
|
// ABI-compatible with the corresponding version of the MSVC and we want to
|
||||||
|
// allow using it compile the application code using MSVC-built DLLs.
|
||||||
|
#define __WX_BO_COMPILER ",Intel C++"
|
||||||
#elif defined(__BORLANDC__)
|
#elif defined(__BORLANDC__)
|
||||||
#define __WX_BO_COMPILER ",Borland C++"
|
#define __WX_BO_COMPILER ",Borland C++"
|
||||||
#elif defined(__DIGITALMARS__)
|
#elif defined(__DIGITALMARS__)
|
||||||
|
|
|
@ -135,36 +135,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
This macro can be used to check that the version of mingw32 CRT is at least
|
wxCHECK_MINGW32_VERSION() is defined in wx/msw/gccpriv.h which is included
|
||||||
maj.min
|
later, see comments there.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
Define Mingw identification symbols, wxCHECK_MINGW32_VERSION() is defined in
|
|
||||||
wx/msw/gccpriv.h which is included later, see comments there.
|
|
||||||
*/
|
|
||||||
#ifdef __MINGW32__
|
|
||||||
/*
|
|
||||||
MinGW-w64 project provides compilers for both Win32 and Win64 but only
|
|
||||||
defines the same __MINGW32__ symbol for the former as MinGW32 toolchain
|
|
||||||
which is quite different (notably doesn't provide many SDK headers that
|
|
||||||
MinGW-w64 does include). So we define a separate symbol which, unlike the
|
|
||||||
predefined __MINGW64__, can be used to detect this toolchain in both 32 and
|
|
||||||
64 bit builds.
|
|
||||||
|
|
||||||
And define __MINGW32_TOOLCHAIN__ for consistency and also because it's
|
|
||||||
convenient as we often want to have some workarounds only for the (old)
|
|
||||||
MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__.
|
|
||||||
*/
|
|
||||||
# ifdef __MINGW64_VERSION_MAJOR
|
|
||||||
# ifndef __MINGW64_TOOLCHAIN__
|
|
||||||
# define __MINGW64_TOOLCHAIN__
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# ifndef __MINGW32_TOOLCHAIN__
|
|
||||||
# define __MINGW32_TOOLCHAIN__
|
|
||||||
# endif
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // _WX_COMPILER_H_
|
#endif // _WX_COMPILER_H_
|
||||||
|
|
|
@ -216,7 +216,7 @@
|
||||||
|
|
||||||
/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
|
/* Prevents conflicts between sys/types.h and winsock.h with Cygwin, */
|
||||||
/* when using Windows sockets. */
|
/* when using Windows sockets. */
|
||||||
#if defined(__CYGWIN__) && defined(__WXMSW__)
|
#if defined(__CYGWIN__) && defined(__WINDOWS__)
|
||||||
#define __USE_W32_SOCKETS
|
#define __USE_W32_SOCKETS
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -4498,57 +4498,4 @@ WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor);
|
||||||
#define wxEVT_COMMAND_TEXT_PASTE wxEVT_TEXT_PASTE
|
#define wxEVT_COMMAND_TEXT_PASTE wxEVT_TEXT_PASTE
|
||||||
#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT
|
#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT
|
||||||
|
|
||||||
#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9
|
|
||||||
#if !defined NO_WX3_GCC49_VIRTUAL_HACK && !defined WXBUILDING
|
|
||||||
// Ugly work-around for GCC 4.9 bug: https://bugs.debian.org/752733
|
|
||||||
#define WX3_GCC49_VIRTUAL_HACK(C) wxEvent* (C::*debian_wx3_gcc49_pr61214_##C##_hack)() const __attribute__((unused)) = &C::Clone
|
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxIdleEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxThreadEvent);
|
|
||||||
|
|
||||||
#if wxUSE_GUI
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxActivateEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxChildFocusEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxClipboardTextEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxCloseEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxCommandEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxContextMenuEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxDisplayChangedEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxDropFilesEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxEraseEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxFocusEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxHelpEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxIconizeEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxInitDialogEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxJoystickEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxKeyEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMaximizeEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMenuEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMouseCaptureChangedEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMouseCaptureLostEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMouseEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxMoveEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxNavigationKeyEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxNcPaintEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxNotifyEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxPaintEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxPaletteChangedEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxQueryNewPaletteEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxScrollEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxScrollWinEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxSetCursorEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxShowEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxSizeEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxSysColourChangedEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxUpdateUIEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxWindowCreateEvent);
|
|
||||||
WX3_GCC49_VIRTUAL_HACK(wxWindowDestroyEvent);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // _WX_EVENT_H_
|
#endif // _WX_EVENT_H_
|
||||||
|
|
|
@ -188,7 +188,7 @@ enum wxPosixPermissions
|
||||||
#elif (defined(__WINDOWS__) || defined(__OS2__)) && \
|
#elif (defined(__WINDOWS__) || defined(__OS2__)) && \
|
||||||
( \
|
( \
|
||||||
defined(__VISUALC__) || \
|
defined(__VISUALC__) || \
|
||||||
defined(__MINGW64__) || \
|
defined(__MINGW64_TOOLCHAIN__) || \
|
||||||
(defined(__MINGW32__) && !defined(__WINE__) && \
|
(defined(__MINGW32__) && !defined(__WINE__) && \
|
||||||
wxCHECK_W32API_VERSION(0, 5)) || \
|
wxCHECK_W32API_VERSION(0, 5)) || \
|
||||||
defined(__DMC__) || \
|
defined(__DMC__) || \
|
||||||
|
@ -203,8 +203,8 @@ enum wxPosixPermissions
|
||||||
// detect compilers which have support for huge files
|
// detect compilers which have support for huge files
|
||||||
#if defined(__VISUALC__)
|
#if defined(__VISUALC__)
|
||||||
#define wxHAS_HUGE_FILES 1
|
#define wxHAS_HUGE_FILES 1
|
||||||
#elif defined(__MINGW32__) || defined(__MINGW64__)
|
#elif defined(__MINGW32__)
|
||||||
#define wxHAS_HUGE_FILES 1f
|
#define wxHAS_HUGE_FILES 1
|
||||||
#elif defined(_LARGE_FILES)
|
#elif defined(_LARGE_FILES)
|
||||||
#define wxHAS_HUGE_FILES 1
|
#define wxHAS_HUGE_FILES 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -281,7 +281,7 @@ enum wxPosixPermissions
|
||||||
// to avoid using them as they're not present in earlier versions and
|
// to avoid using them as they're not present in earlier versions and
|
||||||
// always using the native functions spelling is easier than testing for
|
// always using the native functions spelling is easier than testing for
|
||||||
// the versions
|
// the versions
|
||||||
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64__)
|
#if defined(__BORLANDC__) || defined(__DMC__) || defined(__WATCOMC__) || defined(__MINGW64_TOOLCHAIN__)
|
||||||
#define wxPOSIX_IDENT(func) ::func
|
#define wxPOSIX_IDENT(func) ::func
|
||||||
#else // by default assume MSVC-compatible names
|
#else // by default assume MSVC-compatible names
|
||||||
#define wxPOSIX_IDENT(func) _ ## func
|
#define wxPOSIX_IDENT(func) _ ## func
|
||||||
|
@ -296,7 +296,7 @@ enum wxPosixPermissions
|
||||||
#define wxWrite wxPOSIX_IDENT(write)
|
#define wxWrite wxPOSIX_IDENT(write)
|
||||||
|
|
||||||
#ifdef wxHAS_HUGE_FILES
|
#ifdef wxHAS_HUGE_FILES
|
||||||
#ifndef __MINGW64__
|
#ifndef __MINGW64_TOOLCHAIN__
|
||||||
#define wxSeek wxPOSIX_IDENT(lseeki64)
|
#define wxSeek wxPOSIX_IDENT(lseeki64)
|
||||||
#define wxLseek wxPOSIX_IDENT(lseeki64)
|
#define wxLseek wxPOSIX_IDENT(lseeki64)
|
||||||
#define wxTell wxPOSIX_IDENT(telli64)
|
#define wxTell wxPOSIX_IDENT(telli64)
|
||||||
|
@ -337,7 +337,7 @@ enum wxPosixPermissions
|
||||||
#ifdef wxHAS_HUGE_FILES
|
#ifdef wxHAS_HUGE_FILES
|
||||||
// MinGW-64 provides underscore-less versions of all file functions
|
// MinGW-64 provides underscore-less versions of all file functions
|
||||||
// except for this one.
|
// except for this one.
|
||||||
#ifdef __MINGW64__
|
#ifdef __MINGW64_TOOLCHAIN__
|
||||||
#define wxCRT_StatA _stati64
|
#define wxCRT_StatA _stati64
|
||||||
#else
|
#else
|
||||||
#define wxCRT_StatA wxPOSIX_IDENT(stati64)
|
#define wxCRT_StatA wxPOSIX_IDENT(stati64)
|
||||||
|
|
|
@ -120,6 +120,12 @@ public:
|
||||||
|
|
||||||
wxTextCtrl *EditLabel(long item,
|
wxTextCtrl *EditLabel(long item,
|
||||||
wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
|
wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
|
||||||
|
|
||||||
|
// End label editing, optionally cancelling the edit
|
||||||
|
#if wxABI_VERSION >= 30002
|
||||||
|
bool EndEditLabel(bool cancel);
|
||||||
|
#endif
|
||||||
|
|
||||||
wxTextCtrl* GetEditControl() const;
|
wxTextCtrl* GetEditControl() const;
|
||||||
void Edit( long item ) { EditLabel(item); }
|
void Edit( long item ) { EditLabel(item); }
|
||||||
|
|
||||||
|
|
|
@ -564,6 +564,9 @@ public:
|
||||||
// start editing the label of the given item
|
// start editing the label of the given item
|
||||||
wxTextCtrl *EditLabel(long item,
|
wxTextCtrl *EditLabel(long item,
|
||||||
wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
|
wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
|
||||||
|
|
||||||
|
bool EndEditLabel(bool cancel);
|
||||||
|
|
||||||
wxTextCtrl *GetEditControl() const
|
wxTextCtrl *GetEditControl() const
|
||||||
{
|
{
|
||||||
return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
|
return m_textctrlWrapper ? m_textctrlWrapper->GetText() : NULL;
|
||||||
|
|
|
@ -20,8 +20,8 @@ class WXDLLIMPEXP_CORE wxGenericRichMessageDialog
|
||||||
public:
|
public:
|
||||||
wxGenericRichMessageDialog(wxWindow *parent,
|
wxGenericRichMessageDialog(wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption = wxMessageBoxCaptionStr,
|
||||||
long style)
|
long style = wxOK | wxCENTRE)
|
||||||
: wxRichMessageDialogBase( parent, message, caption, style ),
|
: wxRichMessageDialogBase( parent, message, caption, style ),
|
||||||
m_checkBox(NULL),
|
m_checkBox(NULL),
|
||||||
m_detailsPane(NULL)
|
m_detailsPane(NULL)
|
||||||
|
|
|
@ -238,6 +238,9 @@ private:
|
||||||
// Implement pure virtual function inherited from wxCompositeWindow.
|
// Implement pure virtual function inherited from wxCompositeWindow.
|
||||||
virtual wxWindowList GetCompositeWindowParts() const;
|
virtual wxWindowList GetCompositeWindowParts() const;
|
||||||
|
|
||||||
|
// Position the child controls using the current window size.
|
||||||
|
void DoLayoutControls();
|
||||||
|
|
||||||
#if wxUSE_MENUS
|
#if wxUSE_MENUS
|
||||||
void PopupSearchMenu();
|
void PopupSearchMenu();
|
||||||
#endif // wxUSE_MENUS
|
#endif // wxUSE_MENUS
|
||||||
|
|
|
@ -149,7 +149,6 @@ enum wxLanguage
|
||||||
wxLANGUAGE_ITALIAN_SWISS,
|
wxLANGUAGE_ITALIAN_SWISS,
|
||||||
wxLANGUAGE_JAPANESE,
|
wxLANGUAGE_JAPANESE,
|
||||||
wxLANGUAGE_JAVANESE,
|
wxLANGUAGE_JAVANESE,
|
||||||
wxLANGUAGE_KABYLE,
|
|
||||||
wxLANGUAGE_KANNADA,
|
wxLANGUAGE_KANNADA,
|
||||||
wxLANGUAGE_KASHMIRI,
|
wxLANGUAGE_KASHMIRI,
|
||||||
wxLANGUAGE_KASHMIRI_INDIA,
|
wxLANGUAGE_KASHMIRI_INDIA,
|
||||||
|
@ -270,6 +269,7 @@ enum wxLanguage
|
||||||
wxLANGUAGE_YORUBA,
|
wxLANGUAGE_YORUBA,
|
||||||
wxLANGUAGE_ZHUANG,
|
wxLANGUAGE_ZHUANG,
|
||||||
wxLANGUAGE_ZULU,
|
wxLANGUAGE_ZULU,
|
||||||
|
wxLANGUAGE_KABYLE,
|
||||||
|
|
||||||
/// For custom, user-defined languages.
|
/// For custom, user-defined languages.
|
||||||
wxLANGUAGE_USER_DEFINED
|
wxLANGUAGE_USER_DEFINED
|
||||||
|
|
|
@ -183,6 +183,10 @@ public:
|
||||||
// implementation only from now on
|
// implementation only from now on
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|
||||||
|
// Set alpha flag to true if this is a 32bpp bitmap which has any non-0
|
||||||
|
// values in its alpha channel.
|
||||||
|
void MSWUpdateAlpha();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
|
void SetHBITMAP(WXHBITMAP bmp) { SetHandle((WXHANDLE)bmp); }
|
||||||
WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
|
WXHBITMAP GetHBITMAP() const { return (WXHBITMAP)GetHandle(); }
|
||||||
|
|
|
@ -35,6 +35,28 @@
|
||||||
|
|
||||||
#include <_mingw.h>
|
#include <_mingw.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
MinGW-w64 project provides compilers for both Win32 and Win64 but only
|
||||||
|
defines the same __MINGW32__ symbol for the former as MinGW32 toolchain
|
||||||
|
which is quite different (notably doesn't provide many SDK headers that
|
||||||
|
MinGW-w64 does include). So we define a separate symbol which, unlike
|
||||||
|
the predefined __MINGW64__, can be used to detect this toolchain in
|
||||||
|
both 32 and 64 bit builds.
|
||||||
|
|
||||||
|
And define __MINGW32_TOOLCHAIN__ for consistency and also because it's
|
||||||
|
convenient as we often want to have some workarounds only for the (old)
|
||||||
|
MinGW32 but not (newer) MinGW-w64, which still predefines __MINGW32__.
|
||||||
|
*/
|
||||||
|
#ifdef __MINGW64_VERSION_MAJOR
|
||||||
|
#ifndef __MINGW64_TOOLCHAIN__
|
||||||
|
#define __MINGW64_TOOLCHAIN__
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#ifndef __MINGW32_TOOLCHAIN__
|
||||||
|
#define __MINGW32_TOOLCHAIN__
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#define wxCHECK_MINGW32_VERSION( major, minor ) \
|
#define wxCHECK_MINGW32_VERSION( major, minor ) \
|
||||||
( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
|
( ( ( __MINGW32_MAJOR_VERSION > (major) ) \
|
||||||
|| ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
|
|| ( __MINGW32_MAJOR_VERSION == (major) && __MINGW32_MINOR_VERSION >= (minor) ) ) )
|
||||||
|
|
|
@ -67,6 +67,11 @@ public:
|
||||||
// menu handle and will delete it when this object is destroyed.
|
// menu handle and will delete it when this object is destroyed.
|
||||||
static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); }
|
static wxMenu *MSWNewFromHMENU(WXHMENU hMenu) { return new wxMenu(hMenu); }
|
||||||
|
|
||||||
|
#if wxABI_VERSION >= 30002
|
||||||
|
// Detaches HMENU so that it isn't deleted when this object is destroyed.
|
||||||
|
// Don't use this object after calling this method.
|
||||||
|
WXHMENU MSWDetachHMENU() { WXHMENU m = m_hMenu; m_hMenu = NULL; return m; }
|
||||||
|
#endif
|
||||||
|
|
||||||
// implementation only from now on
|
// implementation only from now on
|
||||||
// -------------------------------
|
// -------------------------------
|
||||||
|
|
|
@ -133,6 +133,11 @@ private:
|
||||||
// common part of all ctors
|
// common part of all ctors
|
||||||
void Init();
|
void Init();
|
||||||
|
|
||||||
|
// Return the item position in the menu containing it.
|
||||||
|
//
|
||||||
|
// Returns -1 if the item is not attached to a menu or if we can't find its
|
||||||
|
// position (which is not really supposed to ever happen).
|
||||||
|
int MSGetMenuItemPos() const;
|
||||||
|
|
||||||
#if wxUSE_OWNER_DRAWN
|
#if wxUSE_OWNER_DRAWN
|
||||||
// item bitmaps
|
// item bitmaps
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <ole2.h>
|
#include <ole2.h>
|
||||||
#include "wx/intl.h"
|
#include "wx/intl.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
|
#include "wx/variant.h"
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// General purpose functions and macros
|
// General purpose functions and macros
|
||||||
|
@ -354,4 +355,30 @@ inline void wxOleUninitialize() { }
|
||||||
|
|
||||||
#endif // wxUSE_OLE/!wxUSE_OLE
|
#endif // wxUSE_OLE/!wxUSE_OLE
|
||||||
|
|
||||||
|
// RAII class initializing OLE in its ctor and undoing it in its dtor.
|
||||||
|
class wxOleInitializer
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wxOleInitializer()
|
||||||
|
: m_ok(wxOleInitialize())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsOk() const
|
||||||
|
{
|
||||||
|
return m_ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
~wxOleInitializer()
|
||||||
|
{
|
||||||
|
if ( m_ok )
|
||||||
|
wxOleUninitialize();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const bool m_ok;
|
||||||
|
|
||||||
|
wxDECLARE_NO_COPY_CLASS(wxOleInitializer);
|
||||||
|
};
|
||||||
|
|
||||||
#endif //_WX_OLEUTILS_H
|
#endif //_WX_OLEUTILS_H
|
||||||
|
|
|
@ -15,8 +15,8 @@ class WXDLLIMPEXP_CORE wxRichMessageDialog : public wxGenericRichMessageDialog
|
||||||
public:
|
public:
|
||||||
wxRichMessageDialog(wxWindow *parent,
|
wxRichMessageDialog(wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption = wxMessageBoxCaptionStr,
|
||||||
long style)
|
long style = wxOK | wxCENTRE)
|
||||||
: wxGenericRichMessageDialog(parent, message, caption, style)
|
: wxGenericRichMessageDialog(parent, message, caption, style)
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
|
@ -170,6 +170,13 @@ public:
|
||||||
// EDIT control has one already)
|
// EDIT control has one already)
|
||||||
void OnContextMenu(wxContextMenuEvent& event);
|
void OnContextMenu(wxContextMenuEvent& event);
|
||||||
|
|
||||||
|
#if wxABI_VERSION >= 30002
|
||||||
|
// Create context menu for RICHEDIT controls. This may be called once during
|
||||||
|
// the control's lifetime or every time the menu is shown, depending on
|
||||||
|
// implementation.
|
||||||
|
wxMenu *MSWCreateContextMenu();
|
||||||
|
#endif
|
||||||
|
|
||||||
// be sure the caret remains invisible if the user
|
// be sure the caret remains invisible if the user
|
||||||
// called HideNativeCaret() before
|
// called HideNativeCaret() before
|
||||||
void OnSetFocus(wxFocusEvent& event);
|
void OnSetFocus(wxFocusEvent& event);
|
||||||
|
|
|
@ -682,6 +682,13 @@ private:
|
||||||
bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
|
bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
|
||||||
bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
|
||||||
|
|
||||||
|
#ifndef __WXUNIVERSAL__
|
||||||
|
// Call ::IsDialogMessage() if it is safe to do it (i.e. if it's not going
|
||||||
|
// to hang or do something else stupid) with the given message, return true
|
||||||
|
// if the message was handled by it.
|
||||||
|
bool MSWSafeIsDialogMessage(WXMSG* msg);
|
||||||
|
#endif // __WXUNIVERSAL__
|
||||||
|
|
||||||
#if wxUSE_DEFERRED_SIZING
|
#if wxUSE_DEFERRED_SIZING
|
||||||
protected:
|
protected:
|
||||||
// this function is called after the window was resized to its new size
|
// this function is called after the window was resized to its new size
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
// IsOpened() method.
|
// IsOpened() method.
|
||||||
//
|
//
|
||||||
// wxPipeOutputStream is similar but has no additional methods at all.
|
// wxPipeOutputStream is similar but has no additional methods at all.
|
||||||
#ifdef __UNIX__
|
#if defined(__UNIX__) && !defined(__WINDOWS__)
|
||||||
#include "wx/unix/private/pipestream.h"
|
#include "wx/unix/private/pipestream.h"
|
||||||
#elif defined(__WINDOWS__) && !defined(__WXWINCE__)
|
#elif defined(__WINDOWS__) && !defined(__WXWINCE__)
|
||||||
#include "wx/msw/private/pipestream.h"
|
#include "wx/msw/private/pipestream.h"
|
||||||
|
|
|
@ -73,8 +73,8 @@ private:
|
||||||
public:
|
public:
|
||||||
wxRichMessageDialog( wxWindow *parent,
|
wxRichMessageDialog( wxWindow *parent,
|
||||||
const wxString& message,
|
const wxString& message,
|
||||||
const wxString& caption,
|
const wxString& caption = wxMessageBoxCaptionStr,
|
||||||
long style )
|
long style = wxOK | wxCENTRE )
|
||||||
: wxGenericRichMessageDialog( parent, message, caption, style )
|
: wxGenericRichMessageDialog( parent, message, caption, style )
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,16 @@ public:
|
||||||
Init();
|
Init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool Create(wxWindow *parent,
|
||||||
|
wxWindowID winid = wxID_ANY,
|
||||||
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
|
const wxSize& size = wxDefaultSize,
|
||||||
|
long style = 0,
|
||||||
|
const wxString& name = wxEmptyString)
|
||||||
|
{
|
||||||
|
return wxBookCtrlBase::Create(parent, winid, pos, size, style | wxBK_TOP, name);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Methods specific to this class.
|
// Methods specific to this class.
|
||||||
|
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
/* NB: this file is parsed by automatic tools so don't change its format! */
|
/* NB: this file is parsed by automatic tools so don't change its format! */
|
||||||
#define wxMAJOR_VERSION 3
|
#define wxMAJOR_VERSION 3
|
||||||
#define wxMINOR_VERSION 0
|
#define wxMINOR_VERSION 0
|
||||||
#define wxRELEASE_NUMBER 1
|
#define wxRELEASE_NUMBER 2
|
||||||
#define wxSUBRELEASE_NUMBER 0
|
#define wxSUBRELEASE_NUMBER 0
|
||||||
#define wxVERSION_STRING wxT("wxWidgets 3.0.1")
|
#define wxVERSION_STRING wxT("wxWidgets 3.0.2")
|
||||||
|
|
||||||
/* nothing to update below this line when updating the version */
|
/* nothing to update below this line when updating the version */
|
||||||
/* ---------------------------------------------------------------------------- */
|
/* ---------------------------------------------------------------------------- */
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/arrstr.h"
|
#include "wx/arrstr.h"
|
||||||
|
#include "wx/scopedarray.h"
|
||||||
|
|
||||||
#include "wx/beforestd.h"
|
#include "wx/beforestd.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
@ -106,10 +107,14 @@ void wxArrayString::Copy(const wxArrayString& src)
|
||||||
}
|
}
|
||||||
|
|
||||||
// grow the array
|
// grow the array
|
||||||
void wxArrayString::Grow(size_t nIncrement)
|
wxString *wxArrayString::Grow(size_t nIncrement)
|
||||||
{
|
{
|
||||||
// only do it if no more place
|
if ( (m_nSize - m_nCount) >= nIncrement )
|
||||||
if ( (m_nSize - m_nCount) < nIncrement ) {
|
{
|
||||||
|
// We already have enough space.
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
// if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
|
// if ARRAY_DEFAULT_INITIAL_SIZE were set to 0, the initially empty would
|
||||||
// be never resized!
|
// be never resized!
|
||||||
#if ARRAY_DEFAULT_INITIAL_SIZE == 0
|
#if ARRAY_DEFAULT_INITIAL_SIZE == 0
|
||||||
|
@ -122,6 +127,9 @@ void wxArrayString::Grow(size_t nIncrement)
|
||||||
if (m_nSize < nIncrement)
|
if (m_nSize < nIncrement)
|
||||||
m_nSize = nIncrement;
|
m_nSize = nIncrement;
|
||||||
m_pItems = new wxString[m_nSize];
|
m_pItems = new wxString[m_nSize];
|
||||||
|
|
||||||
|
// Nothing to free, we hadn't had any memory before.
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// otherwise when it's called for the first time, nIncrement would be 0
|
// otherwise when it's called for the first time, nIncrement would be 0
|
||||||
|
@ -140,11 +148,11 @@ void wxArrayString::Grow(size_t nIncrement)
|
||||||
for ( size_t j = 0; j < m_nCount; j++ )
|
for ( size_t j = 0; j < m_nCount; j++ )
|
||||||
pNew[j] = m_pItems[j];
|
pNew[j] = m_pItems[j];
|
||||||
|
|
||||||
// delete old memory (but do not release the strings!)
|
wxString* const pItemsOld = m_pItems;
|
||||||
delete [] m_pItems;
|
|
||||||
|
|
||||||
m_pItems = pNew;
|
m_pItems = pNew;
|
||||||
}
|
|
||||||
|
return pItemsOld;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -288,7 +296,10 @@ size_t wxArrayString::Add(const wxString& str, size_t nInsert)
|
||||||
return (size_t)lo;
|
return (size_t)lo;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
Grow(nInsert);
|
// Now that we must postpone freeing the old memory until we don't need it
|
||||||
|
// any more, i.e. don't reference "str" which could be a reference to one
|
||||||
|
// of our own strings.
|
||||||
|
wxScopedArray<wxString> oldStrings(Grow(nInsert));
|
||||||
|
|
||||||
for (size_t i = 0; i < nInsert; i++)
|
for (size_t i = 0; i < nInsert; i++)
|
||||||
{
|
{
|
||||||
|
@ -308,7 +319,7 @@ void wxArrayString::Insert(const wxString& str, size_t nIndex, size_t nInsert)
|
||||||
wxCHECK_RET( m_nCount <= m_nCount + nInsert,
|
wxCHECK_RET( m_nCount <= m_nCount + nInsert,
|
||||||
wxT("array size overflow in wxArrayString::Insert") );
|
wxT("array size overflow in wxArrayString::Insert") );
|
||||||
|
|
||||||
Grow(nInsert);
|
wxScopedArray<wxString> oldStrings(Grow(nInsert));
|
||||||
|
|
||||||
for (int j = m_nCount - nIndex - 1; j >= 0; j--)
|
for (int j = m_nCount - nIndex - 1; j >= 0; j--)
|
||||||
m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j];
|
m_pItems[nIndex + nInsert + j] = m_pItems[nIndex + j];
|
||||||
|
@ -327,7 +338,7 @@ wxArrayString::insert(iterator it, const_iterator first, const_iterator last)
|
||||||
const int idx = it - begin();
|
const int idx = it - begin();
|
||||||
|
|
||||||
// grow it once
|
// grow it once
|
||||||
Grow(last - first);
|
wxScopedArray<wxString> oldStrings(Grow(last - first));
|
||||||
|
|
||||||
// reset "it" since it can change inside Grow()
|
// reset "it" since it can change inside Grow()
|
||||||
it = begin() + idx;
|
it = begin() + idx;
|
||||||
|
|
|
@ -214,6 +214,10 @@
|
||||||
(cairo_format_t format, int width), (format, width), 0) \
|
(cairo_format_t format, int width), (format, width), 0) \
|
||||||
m( int, cairo_version, \
|
m( int, cairo_version, \
|
||||||
(), (), 0) \
|
(), (), 0) \
|
||||||
|
m( int, cairo_image_surface_get_width, \
|
||||||
|
(cairo_surface_t *surface), (surface), 0) \
|
||||||
|
m( int, cairo_image_surface_get_height, \
|
||||||
|
(cairo_surface_t *surface), (surface), 0) \
|
||||||
m( int, cairo_image_surface_get_stride, \
|
m( int, cairo_image_surface_get_stride, \
|
||||||
(cairo_surface_t *surface), (surface), 0) \
|
(cairo_surface_t *surface), (surface), 0) \
|
||||||
m( unsigned char *, cairo_image_surface_get_data, \
|
m( unsigned char *, cairo_image_surface_get_data, \
|
||||||
|
|
|
@ -144,7 +144,13 @@ struct wxCmdLineOption
|
||||||
bool HasValue() const { return m_hasVal; }
|
bool HasValue() const { return m_hasVal; }
|
||||||
|
|
||||||
void SetNegated() { m_isNegated = true; }
|
void SetNegated() { m_isNegated = true; }
|
||||||
bool IsNegated() const { return m_isNegated; }
|
bool IsNegated() const
|
||||||
|
{
|
||||||
|
wxASSERT_MSG( kind == wxCMD_LINE_SWITCH,
|
||||||
|
wxT("kind mismatch in wxCmdLineArg") );
|
||||||
|
|
||||||
|
return m_isNegated;
|
||||||
|
}
|
||||||
|
|
||||||
// Reset to the initial state, called before parsing another command line.
|
// Reset to the initial state, called before parsing another command line.
|
||||||
void Reset()
|
void Reset()
|
||||||
|
@ -272,7 +278,8 @@ void wxCmdLineParserData::SetArguments(int argc, char **argv)
|
||||||
// temporarily change the locale here. The only drawback is that changing
|
// temporarily change the locale here. The only drawback is that changing
|
||||||
// the locale is thread-unsafe but precisely because we're called so early
|
// the locale is thread-unsafe but precisely because we're called so early
|
||||||
// it's hopefully safe to assume that no other threads had been created yet.
|
// it's hopefully safe to assume that no other threads had been created yet.
|
||||||
char * const locOld = SetAllLocaleFacets("");
|
char * const locOld = SetAllLocaleFacets(NULL);
|
||||||
|
SetAllLocaleFacets("");
|
||||||
wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld );
|
wxON_BLOCK_EXIT1( SetAllLocaleFacets, locOld );
|
||||||
|
|
||||||
for ( int n = 0; n < argc; n++ )
|
for ( int n = 0; n < argc; n++ )
|
||||||
|
@ -666,6 +673,7 @@ int wxCmdLineParser::Parse(bool showUsage)
|
||||||
Reset();
|
Reset();
|
||||||
|
|
||||||
// parse everything
|
// parse everything
|
||||||
|
m_data->m_parameters.clear();
|
||||||
wxString arg;
|
wxString arg;
|
||||||
size_t count = m_data->m_arguments.size();
|
size_t count = m_data->m_arguments.size();
|
||||||
for ( size_t n = 1; ok && (n < count); n++ ) // 0 is program name
|
for ( size_t n = 1; ok && (n < count); n++ ) // 0 is program name
|
||||||
|
|
|
@ -1461,16 +1461,12 @@ wxDataViewSpinRenderer::wxDataViewSpinRenderer( int min, int max, wxDataViewCell
|
||||||
wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
|
wxWindow* wxDataViewSpinRenderer::CreateEditorCtrl( wxWindow *parent, wxRect labelRect, const wxVariant &value )
|
||||||
{
|
{
|
||||||
long l = value;
|
long l = value;
|
||||||
wxSize size = labelRect.GetSize();
|
|
||||||
#ifdef __WXMAC__
|
|
||||||
size = wxSize( wxMax(70,labelRect.width ), -1 );
|
|
||||||
#endif
|
|
||||||
wxString str;
|
wxString str;
|
||||||
str.Printf( wxT("%d"), (int) l );
|
str.Printf( wxT("%d"), (int) l );
|
||||||
wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
|
wxSpinCtrl *sc = new wxSpinCtrl( parent, wxID_ANY, str,
|
||||||
labelRect.GetTopLeft(), size, wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l );
|
labelRect.GetTopLeft(), labelRect.GetSize(), wxSP_ARROW_KEYS|wxTE_PROCESS_ENTER, m_min, m_max, l );
|
||||||
#ifdef __WXMAC__
|
#ifdef __WXMAC__
|
||||||
size = sc->GetSize();
|
const wxSize size = sc->GetSize();
|
||||||
wxPoint pt = sc->GetPosition();
|
wxPoint pt = sc->GetPosition();
|
||||||
sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
|
sc->SetSize( pt.x - 4, pt.y - 4, size.x, size.y );
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -2084,9 +2084,15 @@ wxDateTime& wxDateTime::MakeTimezone(const TimeZone& tz, bool noDST)
|
||||||
{
|
{
|
||||||
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
||||||
|
|
||||||
// we need to know whether DST is or not in effect for this date unless
|
// We are converting from the local time, but local time zone does not
|
||||||
// the test disabled by the caller
|
// include the DST offset (as it varies depending on the date), so we have
|
||||||
if ( !noDST && (IsDST() == 1) )
|
// to handle DST manually, unless a special flag inhibiting this was
|
||||||
|
// specified.
|
||||||
|
//
|
||||||
|
// Notice that we also shouldn't add the DST offset if we're already in the
|
||||||
|
// local time zone, as indicated by offset of 0, converting from local time
|
||||||
|
// to local time zone shouldn't change it, whether DST is in effect or not.
|
||||||
|
if ( !noDST && secDiff && (IsDST() == 1) )
|
||||||
{
|
{
|
||||||
// FIXME we assume that the DST is always shifted by 1 hour
|
// FIXME we assume that the DST is always shifted by 1 hour
|
||||||
secDiff -= 3600;
|
secDiff -= 3600;
|
||||||
|
@ -2099,9 +2105,8 @@ wxDateTime& wxDateTime::MakeFromTimezone(const TimeZone& tz, bool noDST)
|
||||||
{
|
{
|
||||||
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
long secDiff = wxGetTimeZone() + tz.GetOffset();
|
||||||
|
|
||||||
// we need to know whether DST is or not in effect for this date unless
|
// See comment in MakeTimezone() above, the logic here is exactly the same.
|
||||||
// the test disabled by the caller
|
if ( !noDST && secDiff && (IsDST() == 1) )
|
||||||
if ( !noDST && (IsDST() == 1) )
|
|
||||||
{
|
{
|
||||||
// FIXME we assume that the DST is always shifted by 1 hour
|
// FIXME we assume that the DST is always shifted by 1 hour
|
||||||
secDiff -= 3600;
|
secDiff -= 3600;
|
||||||
|
|
|
@ -271,6 +271,30 @@ GetWeekDayFromName(wxString::const_iterator& p,
|
||||||
return wd;
|
return wd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// return the year of the Monday of the week containing the given date
|
||||||
|
int
|
||||||
|
GetWeekBasedYear(const wxDateTime& dt)
|
||||||
|
{
|
||||||
|
const wxDateTime::Tm tm = dt.GetTm();
|
||||||
|
|
||||||
|
int year = tm.year;
|
||||||
|
|
||||||
|
// The week-based year can only be different from the normal year for few
|
||||||
|
// days in the beginning and the end of the year.
|
||||||
|
if ( tm.yday > 361 )
|
||||||
|
{
|
||||||
|
if ( dt.GetWeekOfYear() == 1 )
|
||||||
|
year++;
|
||||||
|
}
|
||||||
|
else if ( tm.yday < 5 )
|
||||||
|
{
|
||||||
|
if ( dt.GetWeekOfYear() == 53 )
|
||||||
|
year--;
|
||||||
|
}
|
||||||
|
|
||||||
|
return year;
|
||||||
|
}
|
||||||
|
|
||||||
// parses string starting at given iterator using the specified format and,
|
// parses string starting at given iterator using the specified format and,
|
||||||
// optionally, a fall back format (and optionally another one... but it stops
|
// optionally, a fall back format (and optionally another one... but it stops
|
||||||
// there, really)
|
// there, really)
|
||||||
|
@ -324,17 +348,38 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||||
format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
|
format.Replace("%X",wxLocale::GetInfo(wxLOCALE_TIME_FMT));
|
||||||
#endif
|
#endif
|
||||||
// we have to use our own implementation if the date is out of range of
|
// we have to use our own implementation if the date is out of range of
|
||||||
// strftime() or if we use non standard specifiers (notice that "%z" is
|
// strftime()
|
||||||
// special because it is de facto standard under Unix but is not supported
|
|
||||||
// under Windows)
|
|
||||||
#ifdef wxHAS_STRFTIME
|
#ifdef wxHAS_STRFTIME
|
||||||
time_t time = GetTicks();
|
time_t time = GetTicks();
|
||||||
|
|
||||||
if ( (time != (time_t)-1) && !wxStrstr(format, wxT("%l"))
|
bool canUseStrftime = time != (time_t)-1;
|
||||||
|
|
||||||
|
// We also can't use strftime() if we use non standard specifier: either
|
||||||
|
// our own extension "%l" or one of "%g", "%G", "%V", "%z" which are POSIX
|
||||||
|
// but not supported under Windows.
|
||||||
|
for ( wxString::const_iterator p = format.begin();
|
||||||
|
canUseStrftime && p != format.end();
|
||||||
|
++p )
|
||||||
|
{
|
||||||
|
if ( *p != '%' )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// set the default format
|
||||||
|
switch ( (*++p).GetValue() )
|
||||||
|
{
|
||||||
|
case 'l':
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
&& !wxStrstr(format, wxT("%z"))
|
case 'g':
|
||||||
#endif
|
case 'G':
|
||||||
)
|
case 'V':
|
||||||
|
case 'z':
|
||||||
|
#endif // __WINDOWS__
|
||||||
|
canUseStrftime = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( canUseStrftime )
|
||||||
{
|
{
|
||||||
// use strftime()
|
// use strftime()
|
||||||
struct tm tmstruct;
|
struct tm tmstruct;
|
||||||
|
@ -408,6 +453,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||||
switch ( (*++p).GetValue() )
|
switch ( (*++p).GetValue() )
|
||||||
{
|
{
|
||||||
case wxT('Y'): // year has 4 digits
|
case wxT('Y'): // year has 4 digits
|
||||||
|
case wxT('G'): // (and ISO week year too)
|
||||||
case wxT('z'): // time zone as well
|
case wxT('z'): // time zone as well
|
||||||
fmt = wxT("%04d");
|
fmt = wxT("%04d");
|
||||||
break;
|
break;
|
||||||
|
@ -579,6 +625,14 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||||
res += wxString::Format(fmt, tm.mday);
|
res += wxString::Format(fmt, tm.mday);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case wxT('g'): // 2-digit week-based year
|
||||||
|
res += wxString::Format(fmt, GetWeekBasedYear(*this) % 100);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case wxT('G'): // week-based year with century
|
||||||
|
res += wxString::Format(fmt, GetWeekBasedYear(*this));
|
||||||
|
break;
|
||||||
|
|
||||||
case wxT('H'): // hour in 24h format (00-23)
|
case wxT('H'): // hour in 24h format (00-23)
|
||||||
res += wxString::Format(fmt, tm.hour);
|
res += wxString::Format(fmt, tm.hour);
|
||||||
break;
|
break;
|
||||||
|
@ -624,6 +678,7 @@ wxString wxDateTime::Format(const wxString& formatp, const TimeZone& tz) const
|
||||||
res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
|
res += wxString::Format(fmt, GetWeekOfYear(Sunday_First, tz));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case wxT('V'): // ISO week number
|
||||||
case wxT('W'): // week number in the year (Monday 1st week day)
|
case wxT('W'): // week number in the year (Monday 1st week day)
|
||||||
res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
|
res += wxString::Format(fmt, GetWeekOfYear(Monday_First, tz));
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1484,7 +1484,6 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points,
|
||||||
wxCoord y = b;
|
wxCoord y = b;
|
||||||
long x2 = 1;
|
long x2 = 1;
|
||||||
long y2 = y*y;
|
long y2 = y*y;
|
||||||
long y2_old = 0;
|
|
||||||
long y_old = 0;
|
long y_old = 0;
|
||||||
// Lists for quadrant 1 to 4
|
// Lists for quadrant 1 to 4
|
||||||
wxPointList pointsarray[4];
|
wxPointList pointsarray[4];
|
||||||
|
@ -1492,7 +1491,6 @@ void wxDCImpl::CalculateEllipticPoints( wxPointList* points,
|
||||||
for( x = 0; x <= a; ++x )
|
for( x = 0; x <= a; ++x )
|
||||||
{
|
{
|
||||||
x2 = x2+x+x-1;
|
x2 = x2+x+x-1;
|
||||||
y2_old = y2;
|
|
||||||
y_old = y;
|
y_old = y;
|
||||||
bool bNewPoint = false;
|
bool bNewPoint = false;
|
||||||
while( y2 > c1 - c2 * x2 && y > 0 )
|
while( y2 > c1 - c2 * x2 && y > 0 )
|
||||||
|
|
|
@ -24,6 +24,8 @@
|
||||||
#include "wx/icon.h"
|
#include "wx/icon.h"
|
||||||
#include "wx/dcclient.h"
|
#include "wx/dcclient.h"
|
||||||
#include "wx/dcmemory.h"
|
#include "wx/dcmemory.h"
|
||||||
|
#include "wx/math.h"
|
||||||
|
#include "wx/geometry.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
@ -304,6 +306,9 @@ void wxGCDCImpl::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y,
|
||||||
|
|
||||||
m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h );
|
m_graphicContext->DrawBitmap( bmpCopy, x, y, w, h );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
|
void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
|
||||||
|
@ -315,6 +320,9 @@ void wxGCDCImpl::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
|
||||||
wxCoord h = icon.GetHeight();
|
wxCoord h = icon.GetHeight();
|
||||||
|
|
||||||
m_graphicContext->DrawIcon( icon , x, y, w, h );
|
m_graphicContext->DrawIcon( icon , x, y, w, h );
|
||||||
|
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
|
bool wxGCDCImpl::StartDoc( const wxString& WXUNUSED(message) )
|
||||||
|
@ -570,7 +578,7 @@ void wxGCDCImpl::DoCrossHair( wxCoord x, wxCoord y )
|
||||||
m_graphicContext->StrokeLine(x,0,x,h);
|
m_graphicContext->StrokeLine(x,0,x,h);
|
||||||
|
|
||||||
CalcBoundingBox(0, 0);
|
CalcBoundingBox(0, 0);
|
||||||
CalcBoundingBox(0+w, 0+h);
|
CalcBoundingBox(w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1,
|
void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1,
|
||||||
|
@ -617,6 +625,11 @@ void wxGCDCImpl::DoDrawArc( wxCoord x1, wxCoord y1,
|
||||||
if ( fill && ((x1!=x2)||(y1!=y2)) )
|
if ( fill && ((x1!=x2)||(y1!=y2)) )
|
||||||
path.AddLineToPoint( xc, yc );
|
path.AddLineToPoint( xc, yc );
|
||||||
m_graphicContext->DrawPath(path);
|
m_graphicContext->DrawPath(path);
|
||||||
|
|
||||||
|
wxRect2DDouble box = path.GetBox();
|
||||||
|
CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y));
|
||||||
|
CalcBoundingBox(wxRound(box.m_x + box.m_width),
|
||||||
|
wxRound(box.m_y + box.m_height));
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
||||||
|
@ -627,16 +640,19 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
||||||
if ( !m_logicalFunctionSupported )
|
if ( !m_logicalFunctionSupported )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_graphicContext->PushState();
|
wxCoord dx = x + w / 2.0;
|
||||||
m_graphicContext->Translate(x+w/2.0,y+h/2.0);
|
wxCoord dy = y + h / 2.0;
|
||||||
wxDouble factor = ((wxDouble) w) / h;
|
wxDouble factor = ((wxDouble) w) / h;
|
||||||
|
m_graphicContext->PushState();
|
||||||
|
m_graphicContext->Translate(dx, dy);
|
||||||
m_graphicContext->Scale(factor, 1.0);
|
m_graphicContext->Scale(factor, 1.0);
|
||||||
|
wxGraphicsPath path;
|
||||||
|
|
||||||
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
|
// since these angles (ea,sa) are measured counter-clockwise, we invert them to
|
||||||
// get clockwise angles
|
// get clockwise angles
|
||||||
if ( m_brush.GetStyle() != wxTRANSPARENT )
|
if ( m_brush.GetStyle() != wxTRANSPARENT )
|
||||||
{
|
{
|
||||||
wxGraphicsPath path = m_graphicContext->CreatePath();
|
path = m_graphicContext->CreatePath();
|
||||||
path.MoveToPoint( 0, 0 );
|
path.MoveToPoint( 0, 0 );
|
||||||
path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
|
path.AddArc( 0, 0, h/2.0 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
|
||||||
path.AddLineToPoint( 0, 0 );
|
path.AddLineToPoint( 0, 0 );
|
||||||
|
@ -653,6 +669,17 @@ void wxGCDCImpl::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
|
||||||
m_graphicContext->DrawPath( path );
|
m_graphicContext->DrawPath( path );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxRect2DDouble box = path.GetBox();
|
||||||
|
// apply the transformation to the box
|
||||||
|
box.m_x *= factor;
|
||||||
|
box.m_width *= factor;
|
||||||
|
box.m_x += dx;
|
||||||
|
box.m_y += dy;
|
||||||
|
|
||||||
|
CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y));
|
||||||
|
CalcBoundingBox(wxRound(box.m_x + box.m_width),
|
||||||
|
wxRound(box.m_y + box.m_height));
|
||||||
|
|
||||||
m_graphicContext->PopState();
|
m_graphicContext->PopState();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -667,19 +694,34 @@ void wxGCDCImpl::DoDrawLines(int n, const wxPoint points[],
|
||||||
wxCoord xoffset, wxCoord yoffset)
|
wxCoord xoffset, wxCoord yoffset)
|
||||||
{
|
{
|
||||||
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
|
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawLines - invalid DC") );
|
||||||
|
wxASSERT_MSG( n > 0, wxT("wxGCDC(cg)::DoDrawLines - number of points too small") );
|
||||||
|
|
||||||
if ( !m_logicalFunctionSupported )
|
if ( !m_logicalFunctionSupported )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
int minX = points[0].x;
|
||||||
|
int minY = points[0].y;
|
||||||
|
int maxX = minX;
|
||||||
|
int maxY = minY;
|
||||||
|
|
||||||
wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
|
wxPoint2DDouble* pointsD = new wxPoint2DDouble[n];
|
||||||
for( int i = 0; i < n; ++i)
|
for( int i = 0; i < n; ++i)
|
||||||
{
|
{
|
||||||
pointsD[i].m_x = points[i].x + xoffset;
|
wxPoint p = points[i];
|
||||||
pointsD[i].m_y = points[i].y + yoffset;
|
pointsD[i].m_x = p.x + xoffset;
|
||||||
|
pointsD[i].m_y = p.y + yoffset;
|
||||||
|
|
||||||
|
if (p.x < minX) minX = p.x;
|
||||||
|
else if (p.x > maxX) maxX = p.x;
|
||||||
|
if (p.y < minY) minY = p.y;
|
||||||
|
else if (p.y > maxY) maxY = p.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_graphicContext->StrokeLines( n , pointsD);
|
m_graphicContext->StrokeLines( n , pointsD);
|
||||||
delete[] pointsD;
|
delete[] pointsD;
|
||||||
|
|
||||||
|
CalcBoundingBox(minX + xoffset, minY + yoffset);
|
||||||
|
CalcBoundingBox(maxX + xoffset, maxY + yoffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_SPLINES
|
#if wxUSE_SPLINES
|
||||||
|
@ -738,6 +780,11 @@ void wxGCDCImpl::DoDrawSpline(const wxPointList *points)
|
||||||
path.AddLineToPoint( x2 , y2 );
|
path.AddLineToPoint( x2 , y2 );
|
||||||
|
|
||||||
m_graphicContext->StrokePath( path );
|
m_graphicContext->StrokePath( path );
|
||||||
|
|
||||||
|
wxRect2DDouble box = path.GetBox();
|
||||||
|
CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y));
|
||||||
|
CalcBoundingBox(wxRound(box.m_x + box.m_width),
|
||||||
|
wxRound(box.m_y + box.m_height));
|
||||||
}
|
}
|
||||||
#endif // wxUSE_SPLINES
|
#endif // wxUSE_SPLINES
|
||||||
|
|
||||||
|
@ -756,17 +803,31 @@ void wxGCDCImpl::DoDrawPolygon( int n, const wxPoint points[],
|
||||||
if (points[n-1] != points[0])
|
if (points[n-1] != points[0])
|
||||||
closeIt = true;
|
closeIt = true;
|
||||||
|
|
||||||
|
int minX = points[0].x;
|
||||||
|
int minY = points[0].y;
|
||||||
|
int maxX = minX;
|
||||||
|
int maxY = minY;
|
||||||
|
|
||||||
wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)];
|
wxPoint2DDouble* pointsD = new wxPoint2DDouble[n+(closeIt?1:0)];
|
||||||
for( int i = 0; i < n; ++i)
|
for( int i = 0; i < n; ++i)
|
||||||
{
|
{
|
||||||
pointsD[i].m_x = points[i].x + xoffset;
|
wxPoint p = points[i];
|
||||||
pointsD[i].m_y = points[i].y + yoffset;
|
pointsD[i].m_x = p.x + xoffset;
|
||||||
|
pointsD[i].m_y = p.y + yoffset;
|
||||||
|
|
||||||
|
if (p.x < minX) minX = p.x;
|
||||||
|
else if (p.x > maxX) maxX = p.x;
|
||||||
|
if (p.y < minY) minY = p.y;
|
||||||
|
else if (p.y > maxY) maxY = p.y;
|
||||||
}
|
}
|
||||||
if ( closeIt )
|
if ( closeIt )
|
||||||
pointsD[n] = pointsD[0];
|
pointsD[n] = pointsD[0];
|
||||||
|
|
||||||
m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle);
|
m_graphicContext->DrawLines( n+(closeIt?1:0) , pointsD, fillStyle);
|
||||||
delete[] pointsD;
|
delete[] pointsD;
|
||||||
|
|
||||||
|
CalcBoundingBox(minX + xoffset, minY + yoffset);
|
||||||
|
CalcBoundingBox(maxX + xoffset, maxY + yoffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawPolyPolygon(int n,
|
void wxGCDCImpl::DoDrawPolyPolygon(int n,
|
||||||
|
@ -796,6 +857,11 @@ void wxGCDCImpl::DoDrawPolyPolygon(int n,
|
||||||
path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset);
|
path.AddLineToPoint( start.x+ xoffset, start.y+ yoffset);
|
||||||
}
|
}
|
||||||
m_graphicContext->DrawPath( path , fillStyle);
|
m_graphicContext->DrawPath( path , fillStyle);
|
||||||
|
|
||||||
|
wxRect2DDouble box = path.GetBox();
|
||||||
|
CalcBoundingBox(wxRound(box.m_x), wxRound(box.m_y));
|
||||||
|
CalcBoundingBox(wxRound(box.m_x + box.m_width),
|
||||||
|
wxRound(box.m_y + box.m_height));
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
||||||
|
@ -809,6 +875,9 @@ void wxGCDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
||||||
if (w == 0 || h == 0)
|
if (w == 0 || h == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
|
|
||||||
if ( m_graphicContext->ShouldOffset() )
|
if ( m_graphicContext->ShouldOffset() )
|
||||||
{
|
{
|
||||||
// if we are offsetting the entire rectangle is moved 0.5, so the
|
// if we are offsetting the entire rectangle is moved 0.5, so the
|
||||||
|
@ -835,6 +904,9 @@ void wxGCDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
|
||||||
if (w == 0 || h == 0)
|
if (w == 0 || h == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
|
|
||||||
if ( m_graphicContext->ShouldOffset() )
|
if ( m_graphicContext->ShouldOffset() )
|
||||||
{
|
{
|
||||||
// if we are offsetting the entire rectangle is moved 0.5, so the
|
// if we are offsetting the entire rectangle is moved 0.5, so the
|
||||||
|
@ -852,6 +924,9 @@ void wxGCDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
|
||||||
if ( !m_logicalFunctionSupported )
|
if ( !m_logicalFunctionSupported )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
|
|
||||||
if ( m_graphicContext->ShouldOffset() )
|
if ( m_graphicContext->ShouldOffset() )
|
||||||
{
|
{
|
||||||
// if we are offsetting the entire rectangle is moved 0.5, so the
|
// if we are offsetting the entire rectangle is moved 0.5, so the
|
||||||
|
@ -961,6 +1036,9 @@ bool wxGCDCImpl::DoStretchBlit(
|
||||||
// reset composition
|
// reset composition
|
||||||
m_graphicContext->SetCompositionMode(formerMode);
|
m_graphicContext->SetCompositionMode(formerMode);
|
||||||
|
|
||||||
|
CalcBoundingBox(xdest, ydest);
|
||||||
|
CalcBoundingBox(xdest + dstWidth, ydest + dstHeight);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1048,6 +1126,11 @@ void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
|
||||||
m_graphicContext->DrawText( str, x ,y);
|
m_graphicContext->DrawText( str, x ,y);
|
||||||
else
|
else
|
||||||
m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
|
m_graphicContext->DrawText( str, x ,y , m_graphicContext->CreateBrush( wxBrush(m_textBackgroundColour,wxSOLID) ) );
|
||||||
|
|
||||||
|
wxCoord w, h;
|
||||||
|
GetOwner()->GetTextExtent(str, &w, &h);
|
||||||
|
CalcBoundingBox(x, y);
|
||||||
|
CalcBoundingBox(x + w, y + h);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxGCDCImpl::CanGetTextExtent() const
|
bool wxGCDCImpl::CanGetTextExtent() const
|
||||||
|
@ -1191,6 +1274,9 @@ void wxGCDCImpl::DoGradientFillLinear(const wxRect& rect,
|
||||||
m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
|
m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
|
||||||
m_graphicContext->SetPen(m_pen);
|
m_graphicContext->SetPen(m_pen);
|
||||||
m_graphicContext->SetBrush(m_brush);
|
m_graphicContext->SetBrush(m_brush);
|
||||||
|
|
||||||
|
CalcBoundingBox(rect.x, rect.y);
|
||||||
|
CalcBoundingBox(rect.x + rect.width, rect.y + rect.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
|
void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
|
||||||
|
@ -1220,6 +1306,9 @@ void wxGCDCImpl::DoGradientFillConcentric(const wxRect& rect,
|
||||||
m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
|
m_graphicContext->DrawRectangle(rect.x,rect.y,rect.width,rect.height);
|
||||||
m_graphicContext->SetPen(m_pen);
|
m_graphicContext->SetPen(m_pen);
|
||||||
m_graphicContext->SetBrush(m_brush);
|
m_graphicContext->SetBrush(m_brush);
|
||||||
|
|
||||||
|
CalcBoundingBox(rect.x, rect.y);
|
||||||
|
CalcBoundingBox(rect.x + rect.width, rect.y + rect.height);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y,
|
void wxGCDCImpl::DoDrawCheckMark(wxCoord x, wxCoord y,
|
||||||
|
|
|
@ -37,6 +37,7 @@
|
||||||
|
|
||||||
#if wxUSE_GUI
|
#if wxUSE_GUI
|
||||||
#include "wx/window.h"
|
#include "wx/window.h"
|
||||||
|
#include "wx/combobox.h"
|
||||||
#include "wx/control.h"
|
#include "wx/control.h"
|
||||||
#include "wx/dc.h"
|
#include "wx/dc.h"
|
||||||
#include "wx/spinbutt.h"
|
#include "wx/spinbutt.h"
|
||||||
|
@ -435,20 +436,27 @@ wxCommandEvent::wxCommandEvent(wxEventType commandType, int theId)
|
||||||
|
|
||||||
wxString wxCommandEvent::GetString() const
|
wxString wxCommandEvent::GetString() const
|
||||||
{
|
{
|
||||||
if (m_eventType != wxEVT_TEXT || !m_eventObject)
|
// This is part of the hack retrieving the event string from the control
|
||||||
{
|
// itself only when/if it's really needed to avoid copying potentially huge
|
||||||
return m_cmdString;
|
// strings coming from multiline text controls. For consistency we also do
|
||||||
}
|
// it for combo boxes, even though there are no real performance advantages
|
||||||
else
|
// in doing this for them.
|
||||||
|
if (m_eventType == wxEVT_TEXT && m_eventObject)
|
||||||
{
|
{
|
||||||
#if wxUSE_TEXTCTRL
|
#if wxUSE_TEXTCTRL
|
||||||
wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl);
|
wxTextCtrl *txt = wxDynamicCast(m_eventObject, wxTextCtrl);
|
||||||
if ( txt )
|
if ( txt )
|
||||||
return txt->GetValue();
|
return txt->GetValue();
|
||||||
else
|
|
||||||
#endif // wxUSE_TEXTCTRL
|
#endif // wxUSE_TEXTCTRL
|
||||||
return m_cmdString;
|
|
||||||
|
#if wxUSE_COMBOBOX
|
||||||
|
wxComboBox* combo = wxDynamicCast(m_eventObject, wxComboBox);
|
||||||
|
if ( combo )
|
||||||
|
return combo->GetValue();
|
||||||
|
#endif // wxUSE_COMBOBOX
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return m_cmdString;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -1886,7 +1894,7 @@ bool wxEventBlocker::ProcessEvent(wxEvent& event)
|
||||||
return true; // yes, it should: mark this event as processed
|
return true; // yes, it should: mark this event as processed
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return wxEvtHandler::ProcessEvent(event);;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_GUI
|
#endif // wxUSE_GUI
|
||||||
|
|
|
@ -153,11 +153,27 @@ size_t wxFFile::Write(const void *pBuf, size_t nCount)
|
||||||
|
|
||||||
bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
|
bool wxFFile::Write(const wxString& s, const wxMBConv& conv)
|
||||||
{
|
{
|
||||||
const wxWX2MBbuf buf = s.mb_str(conv);
|
// Writing nothing always succeeds -- and simplifies the check for
|
||||||
if ( !buf )
|
// conversion failure below.
|
||||||
return false;
|
if ( s.empty() )
|
||||||
|
return true;
|
||||||
|
|
||||||
|
const wxWX2MBbuf buf = s.mb_str(conv);
|
||||||
|
|
||||||
|
#if wxUSE_UNICODE
|
||||||
|
const size_t size = buf.length();
|
||||||
|
|
||||||
|
if ( !size )
|
||||||
|
{
|
||||||
|
// This means that the conversion failed as the original string wasn't
|
||||||
|
// empty (we explicitly checked for this above) and in this case we
|
||||||
|
// must fail too to indicate that we can't save the data.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
const size_t size = s.length();
|
||||||
|
#endif
|
||||||
|
|
||||||
const size_t size = strlen(buf); // FIXME: use buf.length() when available
|
|
||||||
return Write(buf, size) == size;
|
return Write(buf, size) == size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -356,12 +356,23 @@ size_t wxFile::Write(const void *pBuf, size_t nCount)
|
||||||
|
|
||||||
bool wxFile::Write(const wxString& s, const wxMBConv& conv)
|
bool wxFile::Write(const wxString& s, const wxMBConv& conv)
|
||||||
{
|
{
|
||||||
|
// Writing nothing always succeeds -- and simplifies the check for
|
||||||
|
// conversion failure below.
|
||||||
|
if ( s.empty() )
|
||||||
|
return true;
|
||||||
|
|
||||||
const wxWX2MBbuf buf = s.mb_str(conv);
|
const wxWX2MBbuf buf = s.mb_str(conv);
|
||||||
if ( !buf )
|
|
||||||
return false;
|
|
||||||
|
|
||||||
#if wxUSE_UNICODE
|
#if wxUSE_UNICODE
|
||||||
const size_t size = buf.length();
|
const size_t size = buf.length();
|
||||||
|
|
||||||
|
if ( !size )
|
||||||
|
{
|
||||||
|
// This means that the conversion failed as the original string wasn't
|
||||||
|
// empty (we explicitly checked for this above) and in this case we
|
||||||
|
// must fail too to indicate that we can't save the data.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
const size_t size = s.length();
|
const size_t size = s.length();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -102,6 +102,7 @@
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
#include <shlobj.h> // for CLSID_ShellLink
|
#include <shlobj.h> // for CLSID_ShellLink
|
||||||
#include "wx/msw/missing.h"
|
#include "wx/msw/missing.h"
|
||||||
|
#include "wx/msw/ole/oleutils.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
|
@ -1706,6 +1707,9 @@ bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
|
||||||
if (ext.CmpNoCase(wxT("lnk"))!=0)
|
if (ext.CmpNoCase(wxT("lnk"))!=0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
// Ensure OLE is initialized.
|
||||||
|
wxOleInitializer oleInit;
|
||||||
|
|
||||||
// create a ShellLink object
|
// create a ShellLink object
|
||||||
hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER,
|
||||||
IID_IShellLink, (LPVOID*) &psl);
|
IID_IShellLink, (LPVOID*) &psl);
|
||||||
|
@ -1793,8 +1797,13 @@ bool wxFileName::MakeRelativeTo(const wxString& pathBase, wxPathFormat format)
|
||||||
|
|
||||||
// get cwd only once - small time saving
|
// get cwd only once - small time saving
|
||||||
wxString cwd = wxGetCwd();
|
wxString cwd = wxGetCwd();
|
||||||
Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
|
|
||||||
fnBase.Normalize(wxPATH_NORM_ALL & ~wxPATH_NORM_CASE, cwd, format);
|
// Normalize the paths but avoid changing the case or turning a shortcut
|
||||||
|
// into a file that it points to.
|
||||||
|
const int normFlags = wxPATH_NORM_ALL &
|
||||||
|
~(wxPATH_NORM_CASE | wxPATH_NORM_SHORTCUT);
|
||||||
|
Normalize(normFlags, cwd, format);
|
||||||
|
fnBase.Normalize(normFlags, cwd, format);
|
||||||
|
|
||||||
bool withCase = IsCaseSensitive(format);
|
bool withCase = IsCaseSensitive(format);
|
||||||
|
|
||||||
|
|
|
@ -144,9 +144,11 @@ wxFileSystemWatcherBase::AddAny(const wxFileName& path,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
wxFSWatchInfo& watch = it->second;
|
wxFSWatchInfo& watch = it->second;
|
||||||
int count = watch.IncRef();
|
const int count = watch.IncRef();
|
||||||
wxLogTrace(wxTRACE_FSWATCHER,
|
wxLogTrace(wxTRACE_FSWATCHER,
|
||||||
"'%s' is now watched %d times", canonical, count);
|
"'%s' is now watched %d times", canonical, count);
|
||||||
|
|
||||||
|
wxUnusedVar(count); // could be unused if debug tracing is disabled
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -769,7 +769,11 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
|
||||||
|
|
||||||
wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
|
wxString tmp_str = wxT("RETR ") + wxURI::Unescape(path);
|
||||||
if ( !CheckCommand(tmp_str, '1') )
|
if ( !CheckCommand(tmp_str, '1') )
|
||||||
|
{
|
||||||
|
delete sock;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
sock = AcceptIfActive(sock);
|
sock = AcceptIfActive(sock);
|
||||||
if ( !sock )
|
if ( !sock )
|
||||||
|
@ -800,7 +804,11 @@ wxOutputStream *wxFTP::GetOutputStream(const wxString& path)
|
||||||
|
|
||||||
wxString tmp_str = wxT("STOR ") + path;
|
wxString tmp_str = wxT("STOR ") + path;
|
||||||
if ( !CheckCommand(tmp_str, '1') )
|
if ( !CheckCommand(tmp_str, '1') )
|
||||||
|
{
|
||||||
|
delete sock;
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
sock = AcceptIfActive(sock);
|
sock = AcceptIfActive(sock);
|
||||||
|
|
||||||
|
|
|
@ -721,13 +721,14 @@ bool wxGIFHandler_WriteControl(wxOutputStream *stream,
|
||||||
int maskIndex, int delayMilliSecs)
|
int maskIndex, int delayMilliSecs)
|
||||||
{
|
{
|
||||||
wxUint8 buf[8];
|
wxUint8 buf[8];
|
||||||
|
const wxUint16 delay = delayMilliSecs / 10;
|
||||||
|
|
||||||
buf[0] = GIF_MARKER_EXT; // extension marker
|
buf[0] = GIF_MARKER_EXT; // extension marker
|
||||||
buf[1] = GIF_MARKER_EXT_GRAPHICS_CONTROL;
|
buf[1] = GIF_MARKER_EXT_GRAPHICS_CONTROL;
|
||||||
buf[2] = 4; // length of block
|
buf[2] = 4; // length of block
|
||||||
buf[3] = (maskIndex != wxNOT_FOUND) ? 1 : 0; // has transparency
|
buf[3] = (maskIndex != wxNOT_FOUND) ? 1 : 0; // has transparency
|
||||||
buf[4] = delayMilliSecs / 10; // delay time
|
buf[4] = delay & 0xff; // delay time
|
||||||
buf[5] = 0;
|
buf[5] = (delay >> 8) & 0xff; // delay time second byte
|
||||||
buf[6] = (maskIndex != wxNOT_FOUND) ? (wxUint8) maskIndex : 0;
|
buf[6] = (maskIndex != wxNOT_FOUND) ? (wxUint8) maskIndex : 0;
|
||||||
buf[7] = 0;
|
buf[7] = 0;
|
||||||
return wxGIFHandler_Write(stream, buf, sizeof(buf));
|
return wxGIFHandler_Write(stream, buf, sizeof(buf));
|
||||||
|
|
|
@ -151,9 +151,6 @@
|
||||||
#ifndef LANG_JAPANESE
|
#ifndef LANG_JAPANESE
|
||||||
#define LANG_JAPANESE (0)
|
#define LANG_JAPANESE (0)
|
||||||
#endif
|
#endif
|
||||||
#ifndef LANG_KABYLE
|
|
||||||
#define LANG_KABYLE (0)
|
|
||||||
#endif
|
|
||||||
#ifndef LANG_KANNADA
|
#ifndef LANG_KANNADA
|
||||||
#define LANG_KANNADA (0)
|
#define LANG_KANNADA (0)
|
||||||
#endif
|
#endif
|
||||||
|
@ -268,6 +265,9 @@
|
||||||
#ifndef LANG_VIETNAMESE
|
#ifndef LANG_VIETNAMESE
|
||||||
#define LANG_VIETNAMESE (0)
|
#define LANG_VIETNAMESE (0)
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef LANG_KABYLE
|
||||||
|
#define LANG_KABYLE (0)
|
||||||
|
#endif
|
||||||
#ifndef SUBLANG_ARABIC_ALGERIA
|
#ifndef SUBLANG_ARABIC_ALGERIA
|
||||||
#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
|
#define SUBLANG_ARABIC_ALGERIA SUBLANG_DEFAULT
|
||||||
#endif
|
#endif
|
||||||
|
@ -666,7 +666,6 @@ void wxLocale::InitLanguagesDB()
|
||||||
LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)")
|
LNG(wxLANGUAGE_ITALIAN_SWISS, "it_CH", LANG_ITALIAN , SUBLANG_ITALIAN_SWISS , wxLayout_LeftToRight, "Italian (Swiss)")
|
||||||
LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese")
|
LNG(wxLANGUAGE_JAPANESE, "ja_JP", LANG_JAPANESE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Japanese")
|
||||||
LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese")
|
LNG(wxLANGUAGE_JAVANESE, "jv" , 0 , 0 , wxLayout_LeftToRight, "Javanese")
|
||||||
LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle")
|
|
||||||
LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada")
|
LNG(wxLANGUAGE_KANNADA, "kn" , LANG_KANNADA , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kannada")
|
||||||
LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri")
|
LNG(wxLANGUAGE_KASHMIRI, "ks" , LANG_KASHMIRI , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kashmiri")
|
||||||
LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)")
|
LNG(wxLANGUAGE_KASHMIRI_INDIA, "ks_IN", LANG_KASHMIRI , SUBLANG_KASHMIRI_INDIA , wxLayout_LeftToRight, "Kashmiri (India)")
|
||||||
|
@ -789,6 +788,7 @@ void wxLocale::InitLanguagesDB()
|
||||||
LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba")
|
LNG(wxLANGUAGE_YORUBA, "yo" , 0 , 0 , wxLayout_LeftToRight, "Yoruba")
|
||||||
LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang")
|
LNG(wxLANGUAGE_ZHUANG, "za" , 0 , 0 , wxLayout_LeftToRight, "Zhuang")
|
||||||
LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu")
|
LNG(wxLANGUAGE_ZULU, "zu" , 0 , 0 , wxLayout_LeftToRight, "Zulu")
|
||||||
|
LNG(wxLANGUAGE_KABYLE, "kab" , LANG_KABYLE , SUBLANG_DEFAULT , wxLayout_LeftToRight, "Kabyle")
|
||||||
|
|
||||||
}
|
}
|
||||||
#undef LNG
|
#undef LNG
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#if defined(__UNIX__) && !defined(__WXMSW__)
|
#if defined(__UNIX__) && !defined(__WINDOWS__)
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#endif // __UNIX__
|
#endif // __UNIX__
|
||||||
|
|
|
@ -67,7 +67,19 @@ struct PerfCounter
|
||||||
wxCRIT_SECT_DECLARE_MEMBER(cs);
|
wxCRIT_SECT_DECLARE_MEMBER(cs);
|
||||||
LARGE_INTEGER freq;
|
LARGE_INTEGER freq;
|
||||||
bool init;
|
bool init;
|
||||||
} gs_perfCounter;
|
};
|
||||||
|
|
||||||
|
// Return the global perf counter state.
|
||||||
|
//
|
||||||
|
// This is wrapped in a function to avoid initialization order problems,
|
||||||
|
// otherwise simply creating a global wxStopWatch variable could crash because
|
||||||
|
// it would be using a (possibly) still uninitialized critical section.
|
||||||
|
PerfCounter& GetPerfCounterState()
|
||||||
|
{
|
||||||
|
static PerfCounter s_perfCounter;
|
||||||
|
|
||||||
|
return s_perfCounter;
|
||||||
|
}
|
||||||
|
|
||||||
#endif // __WINDOWS__
|
#endif // __WINDOWS__
|
||||||
|
|
||||||
|
@ -79,10 +91,11 @@ const int MICROSECONDS_PER_SECOND = 1000*1000;
|
||||||
void wxStopWatch::DoStart()
|
void wxStopWatch::DoStart()
|
||||||
{
|
{
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
if ( !gs_perfCounter.init )
|
PerfCounter& perfCounter = GetPerfCounterState();
|
||||||
|
if ( !perfCounter.init )
|
||||||
{
|
{
|
||||||
wxCRIT_SECT_LOCKER(lock, gs_perfCounter.cs);
|
wxCRIT_SECT_LOCKER(lock, perfCounter.cs);
|
||||||
::QueryPerformanceFrequency(&gs_perfCounter.freq);
|
::QueryPerformanceFrequency(&perfCounter.freq);
|
||||||
|
|
||||||
// Just a sanity check: it's not supposed to happen but verify that
|
// Just a sanity check: it's not supposed to happen but verify that
|
||||||
// ::QueryPerformanceCounter() succeeds so that we can really use it.
|
// ::QueryPerformanceCounter() succeeds so that we can really use it.
|
||||||
|
@ -92,10 +105,10 @@ void wxStopWatch::DoStart()
|
||||||
wxLogDebug("QueryPerformanceCounter() unexpected failed (%s), "
|
wxLogDebug("QueryPerformanceCounter() unexpected failed (%s), "
|
||||||
"will not use it.", wxSysErrorMsg());
|
"will not use it.", wxSysErrorMsg());
|
||||||
|
|
||||||
gs_perfCounter.freq.QuadPart = 0;
|
perfCounter.freq.QuadPart = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
gs_perfCounter.init = true;
|
perfCounter.init = true;
|
||||||
}
|
}
|
||||||
#endif // __WINDOWS__
|
#endif // __WINDOWS__
|
||||||
|
|
||||||
|
@ -107,8 +120,8 @@ wxLongLong wxStopWatch::GetClockFreq() const
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
// Under MSW we use the high resolution performance counter timer which has
|
// Under MSW we use the high resolution performance counter timer which has
|
||||||
// its own frequency (usually related to the CPU clock speed).
|
// its own frequency (usually related to the CPU clock speed).
|
||||||
if ( gs_perfCounter.CanBeUsed() )
|
if ( GetPerfCounterState().CanBeUsed() )
|
||||||
return gs_perfCounter.freq.QuadPart;
|
return GetPerfCounterState().freq.QuadPart;
|
||||||
#endif // __WINDOWS__
|
#endif // __WINDOWS__
|
||||||
|
|
||||||
#ifdef HAVE_GETTIMEOFDAY
|
#ifdef HAVE_GETTIMEOFDAY
|
||||||
|
@ -136,7 +149,7 @@ void wxStopWatch::Start(long t0)
|
||||||
wxLongLong wxStopWatch::GetCurrentClockValue() const
|
wxLongLong wxStopWatch::GetCurrentClockValue() const
|
||||||
{
|
{
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
if ( gs_perfCounter.CanBeUsed() )
|
if ( GetPerfCounterState().CanBeUsed() )
|
||||||
{
|
{
|
||||||
LARGE_INTEGER counter;
|
LARGE_INTEGER counter;
|
||||||
::QueryPerformanceCounter(&counter);
|
::QueryPerformanceCounter(&counter);
|
||||||
|
|
|
@ -1244,17 +1244,17 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const
|
||||||
}
|
}
|
||||||
|
|
||||||
// out-of-bounds requests return sensible things
|
// out-of-bounds requests return sensible things
|
||||||
if ( nFirst + nCount > nLen )
|
|
||||||
{
|
|
||||||
nCount = nLen - nFirst;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( nFirst > nLen )
|
if ( nFirst > nLen )
|
||||||
{
|
{
|
||||||
// AllocCopy() will return empty string
|
// AllocCopy() will return empty string
|
||||||
return wxEmptyString;
|
return wxEmptyString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( nCount > nLen - nFirst )
|
||||||
|
{
|
||||||
|
nCount = nLen - nFirst;
|
||||||
|
}
|
||||||
|
|
||||||
wxString dest(*this, nFirst, nCount);
|
wxString dest(*this, nFirst, nCount);
|
||||||
if ( dest.length() != nCount )
|
if ( dest.length() != nCount )
|
||||||
{
|
{
|
||||||
|
@ -1797,6 +1797,8 @@ bool wxString::ToCULong(unsigned long *pVal, int base) const
|
||||||
// point which is different in different locales.
|
// point which is different in different locales.
|
||||||
bool wxString::ToCDouble(double *pVal) const
|
bool wxString::ToCDouble(double *pVal) const
|
||||||
{
|
{
|
||||||
|
// See the explanations in FromCDouble() below for the reasons for all this.
|
||||||
|
|
||||||
// Create a copy of this string using the decimal point instead of whatever
|
// Create a copy of this string using the decimal point instead of whatever
|
||||||
// separator the current locale uses.
|
// separator the current locale uses.
|
||||||
#if wxUSE_INTL
|
#if wxUSE_INTL
|
||||||
|
@ -1854,20 +1856,19 @@ wxString wxString::FromCDouble(double val, int precision)
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" );
|
wxCHECK_MSG( precision >= -1, wxString(), "Invalid negative precision" );
|
||||||
|
|
||||||
#if wxUSE_STD_IOSTREAM && wxUSE_STD_STRING
|
// Unfortunately there is no good way to get the number directly in the C
|
||||||
// We assume that we can use the ostream and not wstream for numbers.
|
// locale. Some platforms provide special functions to do this (e.g.
|
||||||
wxSTD ostringstream os;
|
// _sprintf_l() in MSVS or sprintf_l() in BSD systems), but some systems we
|
||||||
if ( precision != -1 )
|
// still support don't have them and it doesn't seem worth it to have two
|
||||||
{
|
// different ways to do the same thing. Also, in principle, using the
|
||||||
os.precision(precision);
|
// standard C++ streams should allow us to do it, but some implementations
|
||||||
os.setf(std::ios::fixed, std::ios::floatfield);
|
// of them are horribly broken and actually change the global C locale,
|
||||||
}
|
// thus randomly affecting the results produced in other threads, when
|
||||||
|
// imbue() stream method is called (for the record, the latest libstdc++
|
||||||
|
// version included in OS X does it and so seem to do the versions
|
||||||
|
// currently included in Android NDK and both FreeBSD and OpenBSD), so we
|
||||||
|
// can't do this neither and are reduced to this hack.
|
||||||
|
|
||||||
os << val;
|
|
||||||
return os.str();
|
|
||||||
#else // !wxUSE_STD_IOSTREAM
|
|
||||||
// Can't use iostream locale support, fall back to the manual method
|
|
||||||
// instead.
|
|
||||||
wxString s = FromDouble(val, precision);
|
wxString s = FromDouble(val, precision);
|
||||||
#if wxUSE_INTL
|
#if wxUSE_INTL
|
||||||
wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
|
wxString sep = wxLocale::GetInfo(wxLOCALE_DECIMAL_POINT,
|
||||||
|
@ -1881,7 +1882,6 @@ wxString wxString::FromCDouble(double val, int precision)
|
||||||
|
|
||||||
s.Replace(sep, ".");
|
s.Replace(sep, ".");
|
||||||
return s;
|
return s;
|
||||||
#endif // wxUSE_STD_IOSTREAM/!wxUSE_STD_IOSTREAM
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
|
@ -95,6 +95,8 @@ wxStringToStringHashMap gs_msgIdCharset;
|
||||||
// Platform specific helpers
|
// Platform specific helpers
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_LOG_TRACE
|
||||||
|
|
||||||
void LogTraceArray(const char *prefix, const wxArrayString& arr)
|
void LogTraceArray(const char *prefix, const wxArrayString& arr)
|
||||||
{
|
{
|
||||||
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ','));
|
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, wxJoin(arr, ','));
|
||||||
|
@ -107,6 +109,13 @@ void LogTraceLargeArray(const wxString& prefix, const wxArrayString& arr)
|
||||||
wxLogTrace(TRACE_I18N, " %s", *i);
|
wxLogTrace(TRACE_I18N, " %s", *i);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#else // !wxUSE_LOG_TRACE
|
||||||
|
|
||||||
|
#define LogTraceArray(prefix, arr)
|
||||||
|
#define LogTraceLargeArray(prefix, arr)
|
||||||
|
|
||||||
|
#endif // wxUSE_LOG_TRACE/!wxUSE_LOG_TRACE
|
||||||
|
|
||||||
// Use locale-based detection as a fallback
|
// Use locale-based detection as a fallback
|
||||||
wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available))
|
wxString GetPreferredUILanguageFallback(const wxArrayString& WXUNUSED(available))
|
||||||
{
|
{
|
||||||
|
@ -180,6 +189,8 @@ wxString GetPreferredUILanguage(const wxArrayString& available)
|
||||||
|
|
||||||
#elif defined(__WXOSX__)
|
#elif defined(__WXOSX__)
|
||||||
|
|
||||||
|
#if wxUSE_LOG_TRACE
|
||||||
|
|
||||||
void LogTraceArray(const char *prefix, CFArrayRef arr)
|
void LogTraceArray(const char *prefix, CFArrayRef arr)
|
||||||
{
|
{
|
||||||
wxString s;
|
wxString s;
|
||||||
|
@ -193,6 +204,8 @@ void LogTraceArray(const char *prefix, CFArrayRef arr)
|
||||||
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s);
|
wxLogTrace(TRACE_I18N, "%s: [%s]", prefix, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_LOG_TRACE
|
||||||
|
|
||||||
wxString GetPreferredUILanguage(const wxArrayString& available)
|
wxString GetPreferredUILanguage(const wxArrayString& available)
|
||||||
{
|
{
|
||||||
wxStringToStringHashMap availableNormalized;
|
wxStringToStringHashMap availableNormalized;
|
||||||
|
|
|
@ -358,7 +358,7 @@ void wxAnimationCtrl::SetInactiveBitmap(const wxBitmap &bmp)
|
||||||
// (which uses the bitmap's mask), our background colour would be used for
|
// (which uses the bitmap's mask), our background colour would be used for
|
||||||
// transparent areas - and that's not what we want (at least for
|
// transparent areas - and that's not what we want (at least for
|
||||||
// consistency with the GTK version)
|
// consistency with the GTK version)
|
||||||
if ( bmp.GetMask() != NULL && GetParent() != NULL )
|
if ( bmp.IsOk() && bmp.GetMask() != NULL && GetParent() != NULL )
|
||||||
SetBackgroundColour(GetParent()->GetBackgroundColour());
|
SetBackgroundColour(GetParent()->GetBackgroundColour());
|
||||||
|
|
||||||
wxAnimationCtrlBase::SetInactiveBitmap(bmp);
|
wxAnimationCtrlBase::SetInactiveBitmap(bmp);
|
||||||
|
|
|
@ -4359,6 +4359,13 @@ void wxDataViewMainWindow::OnMouse( wxMouseEvent &event )
|
||||||
unsigned int lineFrom = oldCurrentRow,
|
unsigned int lineFrom = oldCurrentRow,
|
||||||
lineTo = current;
|
lineTo = current;
|
||||||
|
|
||||||
|
if ( lineFrom == static_cast<unsigned>(-1) )
|
||||||
|
{
|
||||||
|
// If we hadn't had any current row before, treat this as a
|
||||||
|
// simple click and select the new row only.
|
||||||
|
lineFrom = current;
|
||||||
|
}
|
||||||
|
|
||||||
if ( lineTo < lineFrom )
|
if ( lineTo < lineFrom )
|
||||||
{
|
{
|
||||||
lineTo = lineFrom;
|
lineTo = lineFrom;
|
||||||
|
|
|
@ -387,7 +387,9 @@ class WXDLLIMPEXP_CORE wxCairoContext : public wxGraphicsContext
|
||||||
public:
|
public:
|
||||||
wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
|
wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc );
|
||||||
wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );
|
wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC& dc );
|
||||||
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc );
|
wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc );
|
||||||
|
#endif
|
||||||
#ifdef __WXGTK__
|
#ifdef __WXGTK__
|
||||||
wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window );
|
wxCairoContext( wxGraphicsRenderer* renderer, GdkWindow *window );
|
||||||
#endif
|
#endif
|
||||||
|
@ -1314,6 +1316,10 @@ wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, cairo_surfac
|
||||||
{
|
{
|
||||||
m_surface = bitmap;
|
m_surface = bitmap;
|
||||||
m_pattern = cairo_pattern_create_for_surface(m_surface);
|
m_pattern = cairo_pattern_create_for_surface(m_surface);
|
||||||
|
|
||||||
|
m_width = cairo_image_surface_get_width(m_surface);
|
||||||
|
m_height = cairo_image_surface_get_height(m_surface);
|
||||||
|
m_buffer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer )
|
wxCairoBitmapData::wxCairoBitmapData( wxGraphicsRenderer* renderer, const wxBitmap& bmp ) : wxGraphicsBitmapData( renderer )
|
||||||
|
@ -1640,6 +1646,7 @@ public :
|
||||||
bool m_offset;
|
bool m_offset;
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc )
|
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC& dc )
|
||||||
: wxGraphicsContext(renderer)
|
: wxGraphicsContext(renderer)
|
||||||
{
|
{
|
||||||
|
@ -1684,6 +1691,7 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
|
||||||
org = dc.GetLogicalOrigin();
|
org = dc.GetLogicalOrigin();
|
||||||
cairo_translate( m_context, -org.x, -org.y );
|
cairo_translate( m_context, -org.x, -org.y );
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
|
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC& dc )
|
||||||
: wxGraphicsContext(renderer)
|
: wxGraphicsContext(renderer)
|
||||||
|
@ -2336,7 +2344,9 @@ public :
|
||||||
|
|
||||||
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
|
virtual wxGraphicsContext * CreateContext( const wxWindowDC& dc);
|
||||||
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
|
virtual wxGraphicsContext * CreateContext( const wxMemoryDC& dc);
|
||||||
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
|
virtual wxGraphicsContext * CreateContext( const wxPrinterDC& dc);
|
||||||
|
#endif
|
||||||
|
|
||||||
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
|
virtual wxGraphicsContext * CreateContextFromNativeContext( void * context );
|
||||||
|
|
||||||
|
@ -2429,11 +2439,13 @@ wxGraphicsContext * wxCairoRenderer::CreateContext( const wxMemoryDC& dc)
|
||||||
return new wxCairoContext(this,dc);
|
return new wxCairoContext(this,dc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_PRINTING_ARCHITECTURE
|
||||||
wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
|
wxGraphicsContext * wxCairoRenderer::CreateContext( const wxPrinterDC& dc)
|
||||||
{
|
{
|
||||||
ENSURE_LOADED_OR_RETURN(NULL);
|
ENSURE_LOADED_OR_RETURN(NULL);
|
||||||
return new wxCairoContext(this, dc);
|
return new wxCairoContext(this, dc);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#ifdef __WXMSW__
|
||||||
#if wxUSE_ENH_METAFILE
|
#if wxUSE_ENH_METAFILE
|
||||||
|
|
|
@ -1680,9 +1680,6 @@ void wxGridColLabelWindow::OnPaint( wxPaintEvent& WXUNUSED(event) )
|
||||||
int x, y;
|
int x, y;
|
||||||
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
|
m_owner->CalcUnscrolledPosition( 0, 0, &x, &y );
|
||||||
wxPoint pt = dc.GetDeviceOrigin();
|
wxPoint pt = dc.GetDeviceOrigin();
|
||||||
if (GetLayoutDirection() == wxLayout_RightToLeft)
|
|
||||||
dc.SetDeviceOrigin( pt.x+x, pt.y );
|
|
||||||
else
|
|
||||||
dc.SetDeviceOrigin( pt.x-x, pt.y );
|
dc.SetDeviceOrigin( pt.x-x, pt.y );
|
||||||
|
|
||||||
wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
|
wxArrayInt cols = m_owner->CalcColLabelsExposed( GetUpdateRegion() );
|
||||||
|
@ -2359,12 +2356,15 @@ wxGrid::SetTable(wxGridTableBase *table,
|
||||||
m_numRows = table->GetNumberRows();
|
m_numRows = table->GetNumberRows();
|
||||||
m_numCols = table->GetNumberCols();
|
m_numCols = table->GetNumberCols();
|
||||||
|
|
||||||
if ( m_useNativeHeader )
|
|
||||||
GetGridColHeader()->SetColumnCount(m_numCols);
|
|
||||||
|
|
||||||
m_table = table;
|
m_table = table;
|
||||||
m_table->SetView( this );
|
m_table->SetView( this );
|
||||||
m_ownTable = takeOwnership;
|
m_ownTable = takeOwnership;
|
||||||
|
|
||||||
|
// Notice that this must be called after setting m_table as it uses it
|
||||||
|
// indirectly, via wxGrid::GetColLabelValue().
|
||||||
|
if ( m_useNativeHeader )
|
||||||
|
GetGridColHeader()->SetColumnCount(m_numCols);
|
||||||
|
|
||||||
m_selection = new wxGridSelection( this, selmode );
|
m_selection = new wxGridSelection( this, selmode );
|
||||||
if (checkSelection)
|
if (checkSelection)
|
||||||
{
|
{
|
||||||
|
@ -3733,13 +3733,9 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
|
||||||
|
|
||||||
// and check if we're on the "near" (usually left but right
|
// and check if we're on the "near" (usually left but right
|
||||||
// in RTL case) part of the column
|
// in RTL case) part of the column
|
||||||
bool onNearPart;
|
|
||||||
const int middle = GetColLeft(colValid) +
|
const int middle = GetColLeft(colValid) +
|
||||||
GetColWidth(colValid)/2;
|
GetColWidth(colValid)/2;
|
||||||
if ( GetLayoutDirection() == wxLayout_LeftToRight )
|
const bool onNearPart = (x <= middle);
|
||||||
onNearPart = (x <= middle);
|
|
||||||
else // wxLayout_RightToLeft
|
|
||||||
onNearPart = (x > middle);
|
|
||||||
|
|
||||||
// adjust for the column being dragged itself
|
// adjust for the column being dragged itself
|
||||||
if ( pos < GetColPos(m_dragRowOrCol) )
|
if ( pos < GetColPos(m_dragRowOrCol) )
|
||||||
|
|
|
@ -1420,6 +1420,13 @@ wxListTextCtrlWrapper::wxListTextCtrlWrapper(wxListMainWindow *owner,
|
||||||
|
|
||||||
void wxListTextCtrlWrapper::EndEdit(EndReason reason)
|
void wxListTextCtrlWrapper::EndEdit(EndReason reason)
|
||||||
{
|
{
|
||||||
|
if( m_aboutToFinish )
|
||||||
|
{
|
||||||
|
// We already called Finish which cannot be called
|
||||||
|
// more than once.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
m_aboutToFinish = true;
|
m_aboutToFinish = true;
|
||||||
|
|
||||||
switch ( reason )
|
switch ( reason )
|
||||||
|
@ -1525,6 +1532,7 @@ void wxListTextCtrlWrapper::OnKillFocus( wxFocusEvent &event )
|
||||||
{
|
{
|
||||||
if ( !m_aboutToFinish )
|
if ( !m_aboutToFinish )
|
||||||
{
|
{
|
||||||
|
m_aboutToFinish = true;
|
||||||
if ( !AcceptChanges() )
|
if ( !AcceptChanges() )
|
||||||
m_owner->OnRenameCancelled( m_itemEdited );
|
m_owner->OnRenameCancelled( m_itemEdited );
|
||||||
|
|
||||||
|
@ -2252,6 +2260,17 @@ wxTextCtrl *wxListMainWindow::EditLabel(long item, wxClassInfo* textControlClass
|
||||||
return m_textctrlWrapper->GetText();
|
return m_textctrlWrapper->GetText();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool wxListMainWindow::EndEditLabel(bool cancel)
|
||||||
|
{
|
||||||
|
if (!m_textctrlWrapper)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_textctrlWrapper->EndEdit(cancel ? wxListTextCtrlWrapper::End_Discard : wxListTextCtrlWrapper::End_Accept);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void wxListMainWindow::OnRenameTimer()
|
void wxListMainWindow::OnRenameTimer()
|
||||||
{
|
{
|
||||||
wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") );
|
wxCHECK_RET( HasCurrent(), wxT("unexpected rename timer") );
|
||||||
|
@ -5057,6 +5076,13 @@ wxTextCtrl *wxGenericListCtrl::EditLabel(long item,
|
||||||
return m_mainWin->EditLabel( item, textControlClass );
|
return m_mainWin->EditLabel( item, textControlClass );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxABI_VERSION >= 30002
|
||||||
|
bool wxGenericListCtrl::EndEditLabel(bool cancel)
|
||||||
|
{
|
||||||
|
return m_mainWin->EndEditLabel(cancel);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
wxTextCtrl *wxGenericListCtrl::GetEditControl() const
|
wxTextCtrl *wxGenericListCtrl::GetEditControl() const
|
||||||
{
|
{
|
||||||
return m_mainWin->GetEditControl();
|
return m_mainWin->GetEditControl();
|
||||||
|
|
|
@ -81,6 +81,11 @@ public:
|
||||||
m_notebook->ChangeSelection(page);
|
m_notebook->ChangeSelection(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ShouldPreventAppExit() const
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxNotebook *m_notebook;
|
wxNotebook *m_notebook;
|
||||||
};
|
};
|
||||||
|
|
|
@ -38,17 +38,6 @@
|
||||||
// the margin between the text control and the search/cancel buttons
|
// the margin between the text control and the search/cancel buttons
|
||||||
static const wxCoord MARGIN = 2;
|
static const wxCoord MARGIN = 2;
|
||||||
|
|
||||||
// border around all controls to compensate for wxSIMPLE_BORDER
|
|
||||||
#if defined(__WXMSW__)
|
|
||||||
static const wxCoord BORDER = 0;
|
|
||||||
static const wxCoord ICON_MARGIN = 2;
|
|
||||||
static const wxCoord ICON_OFFSET = 2;
|
|
||||||
#else
|
|
||||||
static const wxCoord BORDER = 2;
|
|
||||||
static const wxCoord ICON_MARGIN = 0;
|
|
||||||
static const wxCoord ICON_OFFSET = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define LIGHT_STEP 160
|
#define LIGHT_STEP 160
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -127,7 +116,7 @@ protected:
|
||||||
//
|
//
|
||||||
// This is a bit ugly and it would arguably be better to use whatever size
|
// This is a bit ugly and it would arguably be better to use whatever size
|
||||||
// the base class version returns and just centre the text vertically in
|
// the base class version returns and just centre the text vertically in
|
||||||
// the search control but I failed to modify the code in LayoutControls()
|
// the search control but I failed to modify the code in DoLayoutControls()
|
||||||
// to do this easily and as there is much in that code I don't understand
|
// to do this easily and as there is much in that code I don't understand
|
||||||
// (notably what is the logic for buttons sizing?) I prefer to not touch it
|
// (notably what is the logic for buttons sizing?) I prefer to not touch it
|
||||||
// at all.
|
// at all.
|
||||||
|
@ -381,8 +370,7 @@ void wxSearchCtrl::SetMenu( wxMenu* menu )
|
||||||
m_searchButton->Refresh();
|
m_searchButton->Refresh();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
wxRect rect = GetRect();
|
DoLayoutControls();
|
||||||
LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
wxMenu* wxSearchCtrl::GetMenu()
|
wxMenu* wxSearchCtrl::GetMenu()
|
||||||
|
@ -405,8 +393,7 @@ void wxSearchCtrl::ShowSearchButton( bool show )
|
||||||
RecalcBitmaps();
|
RecalcBitmaps();
|
||||||
}
|
}
|
||||||
|
|
||||||
wxRect rect = GetRect();
|
DoLayoutControls();
|
||||||
LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxSearchCtrl::IsSearchButtonVisible() const
|
bool wxSearchCtrl::IsSearchButtonVisible() const
|
||||||
|
@ -424,8 +411,7 @@ void wxSearchCtrl::ShowCancelButton( bool show )
|
||||||
}
|
}
|
||||||
m_cancelButtonVisible = show;
|
m_cancelButtonVisible = show;
|
||||||
|
|
||||||
wxRect rect = GetRect();
|
DoLayoutControls();
|
||||||
LayoutControls(0, 0, rect.GetWidth(), rect.GetHeight());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxSearchCtrl::IsCancelButtonVisible() const
|
bool wxSearchCtrl::IsCancelButtonVisible() const
|
||||||
|
@ -470,30 +456,36 @@ wxSize wxSearchCtrl::DoGetBestSize() const
|
||||||
// buttons are square and equal to the height of the text control
|
// buttons are square and equal to the height of the text control
|
||||||
int height = sizeText.y;
|
int height = sizeText.y;
|
||||||
return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder,
|
return wxSize(sizeSearch.x + searchMargin + sizeText.x + cancelMargin + sizeCancel.x + 2*horizontalBorder,
|
||||||
height + 2*BORDER);
|
height) + DoGetBorderSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height)
|
void wxSearchCtrl::DoMoveWindow(int x, int y, int width, int height)
|
||||||
{
|
{
|
||||||
wxSearchCtrlBase::DoMoveWindow(x, y, width, height);
|
wxSearchCtrlBase::DoMoveWindow(x, y, width, height);
|
||||||
|
|
||||||
LayoutControls(0, 0, width, height);
|
DoLayoutControls();
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
|
void wxSearchCtrl::LayoutControls(int WXUNUSED(x), int WXUNUSED(y),
|
||||||
|
int WXUNUSED(width), int WXUNUSED(height))
|
||||||
|
{
|
||||||
|
DoLayoutControls();
|
||||||
|
}
|
||||||
|
|
||||||
|
void wxSearchCtrl::DoLayoutControls()
|
||||||
{
|
{
|
||||||
if ( !m_text )
|
if ( !m_text )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
const wxSize sizeTotal = GetClientSize();
|
||||||
|
int width = sizeTotal.x,
|
||||||
|
height = sizeTotal.y;
|
||||||
|
|
||||||
wxSize sizeText = m_text->GetBestSize();
|
wxSize sizeText = m_text->GetBestSize();
|
||||||
// make room for the search menu & clear button
|
// make room for the search menu & clear button
|
||||||
int horizontalBorder = ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
|
int horizontalBorder = 1 + ( sizeText.y - sizeText.y * 14 / 21 ) / 2;
|
||||||
x += horizontalBorder;
|
int x = horizontalBorder;
|
||||||
y += BORDER;
|
|
||||||
width -= horizontalBorder*2;
|
width -= horizontalBorder*2;
|
||||||
height -= BORDER*2;
|
|
||||||
if (width < 0) width = 0;
|
|
||||||
if (height < 0) height = 0;
|
|
||||||
|
|
||||||
wxSize sizeSearch(0,0);
|
wxSize sizeSearch(0,0);
|
||||||
wxSize sizeCancel(0,0);
|
wxSize sizeCancel(0,0);
|
||||||
|
@ -524,13 +516,17 @@ void wxSearchCtrl::LayoutControls(int x, int y, int width, int height)
|
||||||
|
|
||||||
// position the subcontrols inside the client area
|
// position the subcontrols inside the client area
|
||||||
|
|
||||||
m_searchButton->SetSize(x, y + ICON_OFFSET - 1, sizeSearch.x, height);
|
m_searchButton->SetSize(x, (height - sizeSearch.y) / 2,
|
||||||
m_text->SetSize( x + sizeSearch.x + searchMargin,
|
sizeSearch.x, height);
|
||||||
y + ICON_OFFSET - BORDER,
|
x += sizeSearch.x;
|
||||||
textWidth,
|
x += searchMargin;
|
||||||
height);
|
|
||||||
m_cancelButton->SetSize(x + sizeSearch.x + searchMargin + textWidth + cancelMargin,
|
m_text->SetSize(x, 0, textWidth, height);
|
||||||
y + ICON_OFFSET - 1, sizeCancel.x, height);
|
x += textWidth;
|
||||||
|
x += cancelMargin;
|
||||||
|
|
||||||
|
m_cancelButton->SetSize(x, (height - sizeCancel.y) / 2,
|
||||||
|
sizeCancel.x, height);
|
||||||
}
|
}
|
||||||
|
|
||||||
wxWindowList wxSearchCtrl::GetCompositeWindowParts() const
|
wxWindowList wxSearchCtrl::GetCompositeWindowParts() const
|
||||||
|
@ -1130,7 +1126,7 @@ void wxSearchCtrl::RecalcBitmaps()
|
||||||
}
|
}
|
||||||
wxSize sizeText = m_text->GetBestSize();
|
wxSize sizeText = m_text->GetBestSize();
|
||||||
|
|
||||||
int bitmapHeight = sizeText.y - 2 * ICON_MARGIN;
|
int bitmapHeight = sizeText.y - 4;
|
||||||
int bitmapWidth = sizeText.y * 20 / 14;
|
int bitmapWidth = sizeText.y * 20 / 14;
|
||||||
|
|
||||||
if ( !m_searchBitmapUser )
|
if ( !m_searchBitmapUser )
|
||||||
|
@ -1177,7 +1173,7 @@ void wxSearchCtrl::RecalcBitmaps()
|
||||||
m_cancelBitmap.GetWidth() != bitmapHeight
|
m_cancelBitmap.GetWidth() != bitmapHeight
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
m_cancelBitmap = RenderCancelBitmap(bitmapHeight-BORDER-1,bitmapHeight-BORDER-1); // square
|
m_cancelBitmap = RenderCancelBitmap(bitmapHeight,bitmapHeight); // square
|
||||||
m_cancelButton->SetBitmapLabel(m_cancelBitmap);
|
m_cancelButton->SetBitmapLabel(m_cancelBitmap);
|
||||||
}
|
}
|
||||||
// else this bitmap was set by user, don't alter
|
// else this bitmap was set by user, don't alter
|
||||||
|
@ -1200,9 +1196,7 @@ void wxSearchCtrl::OnSetFocus( wxFocusEvent& /*event*/ )
|
||||||
|
|
||||||
void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
|
void wxSearchCtrl::OnSize( wxSizeEvent& WXUNUSED(event) )
|
||||||
{
|
{
|
||||||
int width, height;
|
DoLayoutControls();
|
||||||
GetSize(&width, &height);
|
|
||||||
LayoutControls(0, 0, width, height);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#if wxUSE_MENUS
|
#if wxUSE_MENUS
|
||||||
|
|
|
@ -458,6 +458,13 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
|
||||||
|
|
||||||
void wxTreeTextCtrl::EndEdit(bool discardChanges)
|
void wxTreeTextCtrl::EndEdit(bool discardChanges)
|
||||||
{
|
{
|
||||||
|
if ( m_aboutToFinish )
|
||||||
|
{
|
||||||
|
// We already called Finish which cannot be called
|
||||||
|
// more than once.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
m_aboutToFinish = true;
|
m_aboutToFinish = true;
|
||||||
|
|
||||||
if ( discardChanges )
|
if ( discardChanges )
|
||||||
|
@ -555,6 +562,7 @@ void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
|
||||||
{
|
{
|
||||||
if ( !m_aboutToFinish )
|
if ( !m_aboutToFinish )
|
||||||
{
|
{
|
||||||
|
m_aboutToFinish = true;
|
||||||
if ( !AcceptChanges() )
|
if ( !AcceptChanges() )
|
||||||
m_owner->OnRenameCancelled( m_itemEdited );
|
m_owner->OnRenameCancelled( m_itemEdited );
|
||||||
|
|
||||||
|
@ -1307,6 +1315,10 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
|
||||||
{
|
{
|
||||||
wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
|
wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
|
||||||
|
|
||||||
|
// Hidden root item is never visible.
|
||||||
|
if ( item == GetRootItem() && HasFlag(wxTR_HIDE_ROOT) )
|
||||||
|
return false;
|
||||||
|
|
||||||
// An item is only visible if it's not a descendant of a collapsed item
|
// An item is only visible if it's not a descendant of a collapsed item
|
||||||
wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
|
wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
|
||||||
wxGenericTreeItem* parent = pItem->GetParent();
|
wxGenericTreeItem* parent = pItem->GetParent();
|
||||||
|
@ -3502,10 +3514,11 @@ wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const
|
||||||
void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
|
void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
|
||||||
bool discardChanges)
|
bool discardChanges)
|
||||||
{
|
{
|
||||||
wxCHECK_RET( m_textCtrl, wxT("not editing label") );
|
if (m_textCtrl)
|
||||||
|
{
|
||||||
m_textCtrl->EndEdit(discardChanges);
|
m_textCtrl->EndEdit(discardChanges);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
|
bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
|
||||||
const wxString& value)
|
const wxString& value)
|
||||||
|
@ -3696,9 +3709,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ( event.LeftUp() || event.RightUp() )
|
else if ( (event.LeftUp() || event.RightUp()) && m_isDragging )
|
||||||
{
|
|
||||||
if ( m_isDragging )
|
|
||||||
{
|
{
|
||||||
ReleaseMouse();
|
ReleaseMouse();
|
||||||
|
|
||||||
|
@ -3733,11 +3744,6 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
|
||||||
event.Skip();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
// If we got to this point, we are not dragging or moving the mouse.
|
// If we got to this point, we are not dragging or moving the mouse.
|
||||||
// Because the code in carbon/toplevel.cpp will only set focus to the
|
// Because the code in carbon/toplevel.cpp will only set focus to the
|
||||||
|
|
|
@ -211,7 +211,8 @@ public:
|
||||||
// we must be constructed with the size of our images as we need to create
|
// we must be constructed with the size of our images as we need to create
|
||||||
// the image list
|
// the image list
|
||||||
wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
|
wxXPButtonImageData(wxAnyButton *btn, const wxBitmap& bitmap)
|
||||||
: m_iml(bitmap.GetWidth(), bitmap.GetHeight(), true /* use mask */,
|
: m_iml(bitmap.GetWidth(), bitmap.GetHeight(),
|
||||||
|
!bitmap.HasAlpha() /* use mask only if no alpha */,
|
||||||
wxAnyButton::State_Max + 1 /* see "pulse" comment below */),
|
wxAnyButton::State_Max + 1 /* see "pulse" comment below */),
|
||||||
m_hwndBtn(GetHwndOf(btn))
|
m_hwndBtn(GetHwndOf(btn))
|
||||||
{
|
{
|
||||||
|
@ -831,7 +832,12 @@ wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state)
|
||||||
if ( state & ODS_DISABLED )
|
if ( state & ODS_DISABLED )
|
||||||
return wxAnyButton::State_Disabled;
|
return wxAnyButton::State_Disabled;
|
||||||
|
|
||||||
if ( state & ODS_SELECTED )
|
// We need to check for the pressed state of the button itself before the
|
||||||
|
// other checks because even if it is selected or current, it it still
|
||||||
|
// pressed first and foremost.
|
||||||
|
const wxAnyButton::State btnState = btn->GetNormalState();
|
||||||
|
|
||||||
|
if ( btnState == wxAnyButton::State_Pressed || state & ODS_SELECTED )
|
||||||
return wxAnyButton::State_Pressed;
|
return wxAnyButton::State_Pressed;
|
||||||
|
|
||||||
if ( btn->HasCapture() || btn->IsMouseInWindow() )
|
if ( btn->HasCapture() || btn->IsMouseInWindow() )
|
||||||
|
@ -840,7 +846,7 @@ wxAnyButton::State GetButtonState(wxAnyButton *btn, UINT state)
|
||||||
if ( state & ODS_FOCUS )
|
if ( state & ODS_FOCUS )
|
||||||
return wxAnyButton::State_Focused;
|
return wxAnyButton::State_Focused;
|
||||||
|
|
||||||
return btn->GetNormalState();
|
return btnState;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DrawButtonText(HDC hdc,
|
void DrawButtonText(HDC hdc,
|
||||||
|
|
|
@ -339,6 +339,60 @@ wxGDIRefData *wxBitmap::CloneGDIRefData(const wxGDIRefData *data) const
|
||||||
return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
|
return new wxBitmapRefData(*static_cast<const wxBitmapRefData *>(data));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Premultiply the values of all RGBA pixels in the given range.
|
||||||
|
static void PremultiplyPixels(unsigned char* begin, unsigned char* end)
|
||||||
|
{
|
||||||
|
for ( unsigned char* pixels = begin; pixels < end; pixels += 4 )
|
||||||
|
{
|
||||||
|
const unsigned char a = pixels[3];
|
||||||
|
|
||||||
|
pixels[0] = ((pixels[0]*a) + 127)/255;
|
||||||
|
pixels[1] = ((pixels[1]*a) + 127)/255;
|
||||||
|
pixels[2] = ((pixels[2]*a) + 127)/255;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Helper which examines the alpha channel for any non-0 values and also
|
||||||
|
// possibly returns the DIB with premultiplied values if it does have alpha
|
||||||
|
// (i.e. this DIB is only filled if the function returns true).
|
||||||
|
//
|
||||||
|
// The function semantics is complicated but necessary to avoid converting to
|
||||||
|
// DIB twice, which is expensive for large bitmaps, yet avoid code duplication
|
||||||
|
// between CopyFromIconOrCursor() and MSWUpdateAlpha().
|
||||||
|
static bool CheckAlpha(HBITMAP hbmp, HBITMAP* hdib = NULL)
|
||||||
|
{
|
||||||
|
BITMAP bm;
|
||||||
|
if ( !::GetObject(hbmp, sizeof(bm), &bm) || (bm.bmBitsPixel != 32) )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
wxDIB dib(hbmp);
|
||||||
|
if ( !dib.IsOk() )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
unsigned char* pixels = dib.GetData();
|
||||||
|
unsigned char* const end = pixels + 4*dib.GetWidth()*dib.GetHeight();
|
||||||
|
for ( ; pixels < end; pixels += 4 )
|
||||||
|
{
|
||||||
|
if ( pixels[3] != 0 )
|
||||||
|
{
|
||||||
|
if ( hdib )
|
||||||
|
{
|
||||||
|
// If we do have alpha, ensure we use premultiplied data for
|
||||||
|
// our pixels as this is what the bitmaps created in other ways
|
||||||
|
// do and this is necessary for e.g. AlphaBlend() to work with
|
||||||
|
// this bitmap.
|
||||||
|
PremultiplyPixels(dib.GetData(), end);
|
||||||
|
|
||||||
|
*hdib = dib.Detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
|
bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
|
||||||
wxBitmapTransparency transp)
|
wxBitmapTransparency transp)
|
||||||
{
|
{
|
||||||
|
@ -360,11 +414,24 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
|
||||||
int w = icon.GetWidth(),
|
int w = icon.GetWidth(),
|
||||||
h = icon.GetHeight();
|
h = icon.GetHeight();
|
||||||
|
|
||||||
|
if ( iconInfo.hbmColor )
|
||||||
|
{
|
||||||
refData->m_width = w;
|
refData->m_width = w;
|
||||||
refData->m_height = h;
|
refData->m_height = h;
|
||||||
refData->m_depth = wxDisplayDepth();
|
refData->m_depth = wxDisplayDepth();
|
||||||
|
|
||||||
refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
|
refData->m_hBitmap = (WXHBITMAP)iconInfo.hbmColor;
|
||||||
|
}
|
||||||
|
else // we only have monochrome icon/cursor
|
||||||
|
{
|
||||||
|
// Then we need to create our own empty bitmap, which will be modified
|
||||||
|
// by the mask below.
|
||||||
|
wxDIB dib(w, h, wxDisplayDepth());
|
||||||
|
if ( dib.IsOk() )
|
||||||
|
{
|
||||||
|
memset(dib.GetData(), 0, wxDIB::GetLineSize(w, dib.GetDepth())*h);
|
||||||
|
refData->AssignDIB(dib);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch ( transp )
|
switch ( transp )
|
||||||
{
|
{
|
||||||
|
@ -379,48 +446,14 @@ bool wxBitmap::CopyFromIconOrCursor(const wxGDIImage& icon,
|
||||||
#if wxUSE_WXDIB
|
#if wxUSE_WXDIB
|
||||||
// If the icon is 32 bits per pixel then it may have alpha channel
|
// If the icon is 32 bits per pixel then it may have alpha channel
|
||||||
// data, although there are some icons that are 32 bpp but have no
|
// data, although there are some icons that are 32 bpp but have no
|
||||||
// alpha... So convert to a DIB and manually check the 4th byte for
|
// alpha, so check for this.
|
||||||
// each pixel.
|
|
||||||
{
|
{
|
||||||
BITMAP bm;
|
HBITMAP hdib = 0;
|
||||||
if ( ::GetObject(iconInfo.hbmColor, sizeof(bm), &bm) &&
|
if ( CheckAlpha(iconInfo.hbmColor, &hdib) )
|
||||||
(bm.bmBitsPixel == 32) )
|
|
||||||
{
|
{
|
||||||
wxDIB dib(iconInfo.hbmColor);
|
|
||||||
if (dib.IsOk())
|
|
||||||
{
|
|
||||||
unsigned char* const pixels = dib.GetData();
|
|
||||||
int idx;
|
|
||||||
for ( idx = 0; idx < w*h*4; idx += 4 )
|
|
||||||
{
|
|
||||||
if (pixels[idx+3] != 0)
|
|
||||||
{
|
|
||||||
// If there is an alpha byte that is non-zero
|
|
||||||
// then set the alpha flag and stop checking
|
|
||||||
refData->m_hasAlpha = true;
|
refData->m_hasAlpha = true;
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( refData->m_hasAlpha )
|
|
||||||
{
|
|
||||||
// If we do have alpha, ensure we use premultiplied
|
|
||||||
// data for our pixels as this is what the bitmaps
|
|
||||||
// created in other ways do and this is necessary
|
|
||||||
// for e.g. AlphaBlend() to work with this bitmap.
|
|
||||||
for ( idx = 0; idx < w*h*4; idx += 4 )
|
|
||||||
{
|
|
||||||
const unsigned char a = pixels[idx+3];
|
|
||||||
|
|
||||||
pixels[idx] = ((pixels[idx] *a) + 127)/255;
|
|
||||||
pixels[idx+1] = ((pixels[idx+1]*a) + 127)/255;
|
|
||||||
pixels[idx+2] = ((pixels[idx+2]*a) + 127)/255;
|
|
||||||
}
|
|
||||||
|
|
||||||
::DeleteObject(refData->m_hBitmap);
|
::DeleteObject(refData->m_hBitmap);
|
||||||
refData->m_hBitmap = dib.Detach();
|
refData->m_hBitmap = hdib;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -1267,6 +1300,12 @@ bool wxBitmap::HasAlpha() const
|
||||||
return GetBitmapData() && GetBitmapData()->m_hasAlpha;
|
return GetBitmapData() && GetBitmapData()->m_hasAlpha;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxBitmap::MSWUpdateAlpha()
|
||||||
|
{
|
||||||
|
if ( CheckAlpha(GetHbitmap()) )
|
||||||
|
GetBitmapData()->m_hasAlpha = true;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxBitmap setters
|
// wxBitmap setters
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
@ -441,7 +441,7 @@ bool wxBitmapComboBox::MSWOnDraw(WXDRAWITEMSTRUCT *item)
|
||||||
//if ( lpDrawItem->itemState & ODS_FOCUS )
|
//if ( lpDrawItem->itemState & ODS_FOCUS )
|
||||||
// DrawFocusRect(lpDrawItem->hDC, &lpDrawItem->rcItem);
|
// DrawFocusRect(lpDrawItem->hDC, &lpDrawItem->rcItem);
|
||||||
|
|
||||||
return TRUE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
|
bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
|
||||||
|
@ -449,9 +449,14 @@ bool wxBitmapComboBox::MSWOnMeasure(WXMEASUREITEMSTRUCT *item)
|
||||||
LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item;
|
LPMEASUREITEMSTRUCT lpMeasureItem = (LPMEASUREITEMSTRUCT) item;
|
||||||
int pos = lpMeasureItem->itemID;
|
int pos = lpMeasureItem->itemID;
|
||||||
|
|
||||||
|
// Measure item height if item list is not empty,
|
||||||
|
// otherwise leave default system value.
|
||||||
|
if ( pos >= 0 )
|
||||||
|
{
|
||||||
lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos);
|
lpMeasureItem->itemHeight = wxBitmapComboBoxBase::MeasureItem(pos);
|
||||||
|
}
|
||||||
|
|
||||||
return TRUE;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_BITMAPCOMBOBOX
|
#endif // wxUSE_BITMAPCOMBOBOX
|
||||||
|
|
|
@ -108,7 +108,7 @@ wxCalendarCtrl::Create(wxWindow *parent,
|
||||||
}
|
}
|
||||||
|
|
||||||
const wxChar * const clsname = s_clsMonthCal.IsRegistered()
|
const wxChar * const clsname = s_clsMonthCal.IsRegistered()
|
||||||
? s_clsMonthCal.GetName().t_str()
|
? static_cast<const wxChar*>(s_clsMonthCal.GetName().t_str())
|
||||||
: MONTHCAL_CLASS;
|
: MONTHCAL_CLASS;
|
||||||
|
|
||||||
if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
|
if ( !MSWCreateControl(clsname, wxEmptyString, pos, size) )
|
||||||
|
|
|
@ -372,7 +372,18 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
|
||||||
// If this HWND doesn't correspond to a wxWindow, it still might be
|
// If this HWND doesn't correspond to a wxWindow, it still might be
|
||||||
// one of its children for which we need to set the background
|
// one of its children for which we need to set the background
|
||||||
// brush, e.g. this is the case for the EDIT control that is part
|
// brush, e.g. this is the case for the EDIT control that is part
|
||||||
// of wxComboBox. Check for this by asking the parent if it has it:
|
// of wxComboBox but also e.g. of wxSlider label HWNDs which are
|
||||||
|
// logically part of it, but are siblings of the main control at
|
||||||
|
// Windows level.
|
||||||
|
//
|
||||||
|
// So check whether it's a sibling of this window which is part of
|
||||||
|
// the same wx object.
|
||||||
|
if ( ContainsHWND(hWnd) )
|
||||||
|
{
|
||||||
|
win = this;
|
||||||
|
}
|
||||||
|
else // Or maybe a child sub-window of this one.
|
||||||
|
{
|
||||||
HWND parent = ::GetParent(hWnd);
|
HWND parent = ::GetParent(hWnd);
|
||||||
if ( parent )
|
if ( parent )
|
||||||
{
|
{
|
||||||
|
@ -381,6 +392,7 @@ WXHBRUSH wxControl::DoMSWControlColor(WXHDC pDC, wxColour colBg, WXHWND hWnd)
|
||||||
win = winParent;
|
win = winParent;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( win )
|
if ( win )
|
||||||
hbr = win->MSWGetBgBrush(pDC);
|
hbr = win->MSWGetBgBrush(pDC);
|
||||||
|
|
|
@ -1037,7 +1037,9 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
|
||||||
wxCoord x2 = x + width;
|
wxCoord x2 = x + width;
|
||||||
wxCoord y2 = y + height;
|
wxCoord y2 = y + height;
|
||||||
|
|
||||||
wxCoord x2dev = XLOG2DEV(x2),
|
wxCoord x1dev = XLOG2DEV(x),
|
||||||
|
y1dev = YLOG2DEV(y),
|
||||||
|
x2dev = XLOG2DEV(x2),
|
||||||
y2dev = YLOG2DEV(y2);
|
y2dev = YLOG2DEV(y2);
|
||||||
|
|
||||||
// Windows (but not Windows CE) draws the filled rectangles without outline
|
// Windows (but not Windows CE) draws the filled rectangles without outline
|
||||||
|
@ -1046,12 +1048,18 @@ void wxMSWDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
|
||||||
#ifndef __WXWINCE__
|
#ifndef __WXWINCE__
|
||||||
if ( m_pen.IsTransparent() )
|
if ( m_pen.IsTransparent() )
|
||||||
{
|
{
|
||||||
|
// Right edge to be extended is "displayed right edge"
|
||||||
|
// and hence its device coordinates depend
|
||||||
|
// on layout direction and can be either x1 or x2.
|
||||||
|
if ( GetLayoutDirection() == wxLayout_RightToLeft )
|
||||||
|
x1dev--;
|
||||||
|
else
|
||||||
x2dev++;
|
x2dev++;
|
||||||
y2dev++;
|
y2dev++;
|
||||||
}
|
}
|
||||||
#endif // !__WXWINCE__
|
#endif // !__WXWINCE__
|
||||||
|
|
||||||
(void)Rectangle(GetHdc(), XLOG2DEV(x), YLOG2DEV(y), x2dev, y2dev);
|
(void)Rectangle(GetHdc(), x1dev, y1dev, x2dev, y2dev);
|
||||||
|
|
||||||
CalcBoundingBox(x, y);
|
CalcBoundingBox(x, y);
|
||||||
CalcBoundingBox(x2, y2);
|
CalcBoundingBox(x2, y2);
|
||||||
|
@ -1932,6 +1940,50 @@ void ApplyEffectiveScale(double scale, int sign, int *device, int *logical)
|
||||||
*logical = sign*wxRound(VIEWPORT_EXTENT/scale);
|
*logical = sign*wxRound(VIEWPORT_EXTENT/scale);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Binary GCD algorithm
|
||||||
|
// See: http://en.wikipedia.org/wiki/Binary_GCD_algorithm#Iterative_version_in_C
|
||||||
|
unsigned int CalcGCD(unsigned int u, unsigned int v)
|
||||||
|
{
|
||||||
|
// GCD(0,v) == v; GCD(u,0) == u, GCD(0,0) == 0
|
||||||
|
if (u == 0)
|
||||||
|
return v;
|
||||||
|
if (v == 0)
|
||||||
|
return u;
|
||||||
|
|
||||||
|
int shift;
|
||||||
|
|
||||||
|
// Let shift := lg K, where K is the greatest power of 2
|
||||||
|
// dividing both u and v.
|
||||||
|
for (shift = 0; ((u | v) & 1) == 0; ++shift)
|
||||||
|
{
|
||||||
|
u >>= 1;
|
||||||
|
v >>= 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
while ((u & 1) == 0)
|
||||||
|
u >>= 1;
|
||||||
|
|
||||||
|
// From here on, u is always odd.
|
||||||
|
do
|
||||||
|
{
|
||||||
|
// remove all factors of 2 in v -- they are not common
|
||||||
|
// note: v is not zero, so while will terminate
|
||||||
|
while ((v & 1) == 0)
|
||||||
|
v >>= 1;
|
||||||
|
|
||||||
|
// Now u and v are both odd. Swap if necessary so u <= v,
|
||||||
|
// then set v = v - u (which is even)
|
||||||
|
if (u > v)
|
||||||
|
{
|
||||||
|
wxSwap(u, v);
|
||||||
|
}
|
||||||
|
v -= u; // Here v >= u
|
||||||
|
} while (v != 0);
|
||||||
|
|
||||||
|
// restore common factors of 2
|
||||||
|
return u << shift;
|
||||||
|
}
|
||||||
|
|
||||||
} // anonymous namespace
|
} // anonymous namespace
|
||||||
|
|
||||||
void wxMSWDCImpl::RealizeScaleAndOrigin()
|
void wxMSWDCImpl::RealizeScaleAndOrigin()
|
||||||
|
@ -1952,6 +2004,16 @@ void wxMSWDCImpl::RealizeScaleAndOrigin()
|
||||||
ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX);
|
ApplyEffectiveScale(m_scaleX, m_signX, &devExtX, &logExtX);
|
||||||
ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY);
|
ApplyEffectiveScale(m_scaleY, m_signY, &devExtY, &logExtY);
|
||||||
|
|
||||||
|
// Becaue only devExtX/logExtX ratio and devExtY/logExtY ratio are counted
|
||||||
|
// we can reduce the fractions to avoid large absolute numbers
|
||||||
|
// and possible arithmetic overflows.
|
||||||
|
unsigned int gcd = CalcGCD(abs(devExtX), abs(logExtX));
|
||||||
|
devExtX /= gcd;
|
||||||
|
logExtX /= gcd;
|
||||||
|
gcd = CalcGCD(abs(devExtY), abs(logExtY));
|
||||||
|
devExtY /= gcd;
|
||||||
|
logExtY /= gcd;
|
||||||
|
|
||||||
::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL);
|
::SetViewportExtEx(GetHdc(), devExtX, devExtY, NULL);
|
||||||
::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL);
|
::SetWindowExtEx(GetHdc(), logExtX, logExtY, NULL);
|
||||||
|
|
||||||
|
|
|
@ -386,12 +386,20 @@ int wxDirDialog::ShowIFileDialog(WXHWND owner)
|
||||||
NULL,
|
NULL,
|
||||||
wxIID_PPV_ARGS(IShellItem,
|
wxIID_PPV_ARGS(IShellItem,
|
||||||
&folder));
|
&folder));
|
||||||
|
|
||||||
|
// Failing to parse the folder name is not really an error, we'll just
|
||||||
|
// ignore the initial directory in this case, but we should still show
|
||||||
|
// the dialog.
|
||||||
if ( FAILED(hr) )
|
if ( FAILED(hr) )
|
||||||
|
{
|
||||||
|
if ( hr != HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) )
|
||||||
{
|
{
|
||||||
wxLogApiError(wxS("SHCreateItemFromParsingName"), hr);
|
wxLogApiError(wxS("SHCreateItemFromParsingName"), hr);
|
||||||
return wxID_NONE;
|
return wxID_NONE;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
else // The folder was parsed correctly.
|
||||||
|
{
|
||||||
hr = fileDialog->SetFolder(folder);
|
hr = fileDialog->SetFolder(folder);
|
||||||
if ( FAILED(hr) )
|
if ( FAILED(hr) )
|
||||||
{
|
{
|
||||||
|
@ -399,6 +407,7 @@ int wxDirDialog::ShowIFileDialog(WXHWND owner)
|
||||||
return wxID_NONE;
|
return wxID_NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
wxString path;
|
wxString path;
|
||||||
|
|
|
@ -360,7 +360,7 @@ void wxFontRefData::Init(int pointSize,
|
||||||
if ( m_sizeUsingPixels )
|
if ( m_sizeUsingPixels )
|
||||||
SetPixelSize(pixelSize);
|
SetPixelSize(pixelSize);
|
||||||
else
|
else
|
||||||
SetPointSize(pointSize);
|
SetPointSize(pointSize == -1 ? wxNORMAL_FONT->GetPointSize() : pointSize);
|
||||||
|
|
||||||
SetStyle(style);
|
SetStyle(style);
|
||||||
SetWeight(weight);
|
SetWeight(weight);
|
||||||
|
@ -841,7 +841,7 @@ bool wxFont::DoCreate(int pointSize,
|
||||||
|
|
||||||
// wxDEFAULT is a valid value for the font size too so we must treat it
|
// wxDEFAULT is a valid value for the font size too so we must treat it
|
||||||
// specially here (otherwise the size would be 70 == wxDEFAULT value)
|
// specially here (otherwise the size would be 70 == wxDEFAULT value)
|
||||||
if ( pointSize == wxDEFAULT || pointSize == -1 )
|
if ( pointSize == wxDEFAULT )
|
||||||
{
|
{
|
||||||
pointSize = wxNORMAL_FONT->GetPointSize();
|
pointSize = wxNORMAL_FONT->GetPointSize();
|
||||||
}
|
}
|
||||||
|
|
|
@ -286,6 +286,13 @@ void wxFrame::PositionStatusBar()
|
||||||
int w, h;
|
int w, h;
|
||||||
GetClientSize(&w, &h);
|
GetClientSize(&w, &h);
|
||||||
|
|
||||||
|
// Resize the status bar to its default height, as it could have been set
|
||||||
|
// to a wrong value before by WM_SIZE sent during the frame creation and
|
||||||
|
// our status bars preserve their programmatically set size to avoid being
|
||||||
|
// resized by DefWindowProc() to the full window width, so if we didn't do
|
||||||
|
// this here, the status bar would retain the possibly wrong current height.
|
||||||
|
m_frameStatusBar->SetSize(wxDefaultSize, wxSIZE_AUTO_HEIGHT);
|
||||||
|
|
||||||
int sw, sh;
|
int sw, sh;
|
||||||
m_frameStatusBar->GetSize(&sw, &sh);
|
m_frameStatusBar->GetSize(&sw, &sh);
|
||||||
|
|
||||||
|
|
|
@ -289,7 +289,9 @@ protected:
|
||||||
private:
|
private:
|
||||||
// common part of Create{Linear,Radial}GradientBrush()
|
// common part of Create{Linear,Radial}GradientBrush()
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void SetGradientStops(T *brush, const wxGraphicsGradientStops& stops);
|
void SetGradientStops(T *brush,
|
||||||
|
const wxGraphicsGradientStops& stops,
|
||||||
|
bool reversed = false);
|
||||||
|
|
||||||
Brush* m_brush;
|
Brush* m_brush;
|
||||||
Image* m_brushImage;
|
Image* m_brushImage;
|
||||||
|
@ -857,7 +859,8 @@ void wxGDIPlusBrushData::Init()
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void
|
void
|
||||||
wxGDIPlusBrushData::SetGradientStops(T *brush,
|
wxGDIPlusBrushData::SetGradientStops(T *brush,
|
||||||
const wxGraphicsGradientStops& stops)
|
const wxGraphicsGradientStops& stops,
|
||||||
|
bool reversed)
|
||||||
{
|
{
|
||||||
const unsigned numStops = stops.GetCount();
|
const unsigned numStops = stops.GetCount();
|
||||||
if ( numStops <= 2 )
|
if ( numStops <= 2 )
|
||||||
|
@ -870,6 +873,18 @@ wxGDIPlusBrushData::SetGradientStops(T *brush,
|
||||||
wxVector<Color> colors(numStops);
|
wxVector<Color> colors(numStops);
|
||||||
wxVector<REAL> positions(numStops);
|
wxVector<REAL> positions(numStops);
|
||||||
|
|
||||||
|
if ( reversed )
|
||||||
|
{
|
||||||
|
for ( unsigned i = 0; i < numStops; i++ )
|
||||||
|
{
|
||||||
|
wxGraphicsGradientStop stop = stops.Item(numStops - i - 1);
|
||||||
|
|
||||||
|
colors[i] = wxColourToColor(stop.GetColour());
|
||||||
|
positions[i] = 1.0 - stop.GetPosition();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
for ( unsigned i = 0; i < numStops; i++ )
|
for ( unsigned i = 0; i < numStops; i++ )
|
||||||
{
|
{
|
||||||
wxGraphicsGradientStop stop = stops.Item(i);
|
wxGraphicsGradientStop stop = stops.Item(i);
|
||||||
|
@ -877,6 +892,7 @@ wxGDIPlusBrushData::SetGradientStops(T *brush,
|
||||||
colors[i] = wxColourToColor(stop.GetColour());
|
colors[i] = wxColourToColor(stop.GetColour());
|
||||||
positions[i] = stop.GetPosition();
|
positions[i] = stop.GetPosition();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
brush->SetInterpolationColors(&colors[0], &positions[0], numStops);
|
brush->SetInterpolationColors(&colors[0], &positions[0], numStops);
|
||||||
}
|
}
|
||||||
|
@ -914,7 +930,9 @@ wxGDIPlusBrushData::CreateRadialGradientBrush(wxDouble xo, wxDouble yo,
|
||||||
int count = 1;
|
int count = 1;
|
||||||
brush->SetSurroundColors(&col, &count);
|
brush->SetSurroundColors(&col, &count);
|
||||||
|
|
||||||
SetGradientStops(brush, stops);
|
// Because the GDI+ API draws radial gradients from outside towards the
|
||||||
|
// center we have to reverse the order of the gradient stops.
|
||||||
|
SetGradientStops(brush, stops, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
@ -374,7 +374,6 @@ bool wxImageList::Draw(int index,
|
||||||
// Get the bitmap
|
// Get the bitmap
|
||||||
wxBitmap wxImageList::GetBitmap(int index) const
|
wxBitmap wxImageList::GetBitmap(int index) const
|
||||||
{
|
{
|
||||||
#if wxUSE_WXDIB && wxUSE_IMAGE
|
|
||||||
int bmp_width = 0, bmp_height = 0;
|
int bmp_width = 0, bmp_height = 0;
|
||||||
GetSize(index, bmp_width, bmp_height);
|
GetSize(index, bmp_width, bmp_height);
|
||||||
|
|
||||||
|
@ -382,6 +381,11 @@ wxBitmap wxImageList::GetBitmap(int index) const
|
||||||
wxMemoryDC dc;
|
wxMemoryDC dc;
|
||||||
dc.SelectObject(bitmap);
|
dc.SelectObject(bitmap);
|
||||||
|
|
||||||
|
#if wxUSE_WXDIB && wxUSE_IMAGE
|
||||||
|
IMAGEINFO ii;
|
||||||
|
ImageList_GetImageInfo(GetHImageList(), index, &ii);
|
||||||
|
if ( ii.hbmMask )
|
||||||
|
{
|
||||||
// draw it the first time to find a suitable mask colour
|
// draw it the first time to find a suitable mask colour
|
||||||
((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
|
((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
|
||||||
dc.SelectObject(wxNullBitmap);
|
dc.SelectObject(wxNullBitmap);
|
||||||
|
@ -405,6 +409,22 @@ wxBitmap wxImageList::GetBitmap(int index) const
|
||||||
image = bitmap.ConvertToImage();
|
image = bitmap.ConvertToImage();
|
||||||
image.SetMaskColour(r, g, b);
|
image.SetMaskColour(r, g, b);
|
||||||
bitmap = wxBitmap(image);
|
bitmap = wxBitmap(image);
|
||||||
|
}
|
||||||
|
else // no mask
|
||||||
|
{
|
||||||
|
// Just draw it normally.
|
||||||
|
((wxImageList*)this)->Draw(index, dc, 0, 0, wxIMAGELIST_DRAW_NORMAL);
|
||||||
|
dc.SelectObject(wxNullBitmap);
|
||||||
|
|
||||||
|
// And adjust its alpha flag as the destination bitmap would get it if
|
||||||
|
// the source one had it.
|
||||||
|
//
|
||||||
|
// Note that perhaps we could just call UseAlpha() which would set the
|
||||||
|
// "has alpha" flag unconditionally as it doesn't seem to do any harm,
|
||||||
|
// but for now only do it if necessary, just to be on the safe side,
|
||||||
|
// even if it requires more work (and takes more time).
|
||||||
|
bitmap.MSWUpdateAlpha();
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
wxBitmap bitmap;
|
wxBitmap bitmap;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -360,7 +360,7 @@ wxMenu::~wxMenu()
|
||||||
// we should free Windows resources only if Windows doesn't do it for us
|
// we should free Windows resources only if Windows doesn't do it for us
|
||||||
// which happens if we're attached to a menubar or a submenu of another
|
// which happens if we're attached to a menubar or a submenu of another
|
||||||
// menu
|
// menu
|
||||||
if ( !IsAttached() && !GetParent() )
|
if ( m_hMenu && !IsAttached() && !GetParent() )
|
||||||
{
|
{
|
||||||
if ( !::DestroyMenu(GetHmenu()) )
|
if ( !::DestroyMenu(GetHmenu()) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -671,14 +671,11 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
|
||||||
m_parentMenu->UpdateAccel(this);
|
m_parentMenu->UpdateAccel(this);
|
||||||
#endif // wxUSE_ACCEL
|
#endif // wxUSE_ACCEL
|
||||||
|
|
||||||
const UINT id = GetMSWId();
|
const int itemPos = MSGetMenuItemPos();
|
||||||
HMENU hMenu = GetHMenuOf(m_parentMenu);
|
if ( itemPos == -1 )
|
||||||
if ( !hMenu )
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const UINT state = ::GetMenuState(hMenu, id, MF_BYCOMMAND);
|
HMENU hMenu = GetHMenuOf(m_parentMenu);
|
||||||
if ( state == (UINT)-1 )
|
|
||||||
return;
|
|
||||||
|
|
||||||
// update the text of the native menu item
|
// update the text of the native menu item
|
||||||
WinStruct<MENUITEMINFO> info;
|
WinStruct<MENUITEMINFO> info;
|
||||||
|
@ -696,7 +693,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
|
||||||
info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
|
info.fMask |= MIIM_BITMAP | MIIM_FTYPE;
|
||||||
else
|
else
|
||||||
info.fMask |= MIIM_TYPE;
|
info.fMask |= MIIM_TYPE;
|
||||||
if ( !::GetMenuItemInfo(hMenu, id, FALSE, &info) )
|
if ( !::GetMenuItemInfo(hMenu, itemPos, TRUE, &info) )
|
||||||
{
|
{
|
||||||
wxLogLastError(wxT("GetMenuItemInfo"));
|
wxLogLastError(wxT("GetMenuItemInfo"));
|
||||||
return;
|
return;
|
||||||
|
@ -716,7 +713,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
|
||||||
// Also notice that we shouldn't use our IsOwnerDrawn() because it can be
|
// Also notice that we shouldn't use our IsOwnerDrawn() because it can be
|
||||||
// true because it was set by e.g. SetBitmap(), even if the item wasn't
|
// true because it was set by e.g. SetBitmap(), even if the item wasn't
|
||||||
// made owner drawn at Windows level.
|
// made owner drawn at Windows level.
|
||||||
if ( !(state & MF_OWNERDRAW) )
|
if ( !(info.fState & MF_OWNERDRAW) )
|
||||||
#endif // wxUSE_OWNER_DRAWN
|
#endif // wxUSE_OWNER_DRAWN
|
||||||
{
|
{
|
||||||
if ( isLaterThanWin95 )
|
if ( isLaterThanWin95 )
|
||||||
|
@ -726,7 +723,7 @@ void wxMenuItem::SetItemLabel(const wxString& txt)
|
||||||
info.cch = m_text.length();
|
info.cch = m_text.length();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !::SetMenuItemInfo(hMenu, id, FALSE, &info) )
|
if ( !::SetMenuItemInfo(hMenu, itemPos, TRUE, &info) )
|
||||||
{
|
{
|
||||||
wxLogLastError(wxT("SetMenuItemInfo"));
|
wxLogLastError(wxT("SetMenuItemInfo"));
|
||||||
}
|
}
|
||||||
|
@ -1251,6 +1248,42 @@ void wxMenuItem::GetColourToUse(wxODStatus stat, wxColour& colText, wxColour& co
|
||||||
}
|
}
|
||||||
#endif // wxUSE_OWNER_DRAWN
|
#endif // wxUSE_OWNER_DRAWN
|
||||||
|
|
||||||
|
int wxMenuItem::MSGetMenuItemPos() const
|
||||||
|
{
|
||||||
|
if ( !m_parentMenu )
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
const HMENU hMenu = GetHMenuOf(m_parentMenu);
|
||||||
|
if ( !hMenu )
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
const UINT id = GetMSWId();
|
||||||
|
const int menuItems = ::GetMenuItemCount(hMenu);
|
||||||
|
for ( int i = 0; i < menuItems; i++ )
|
||||||
|
{
|
||||||
|
const UINT state = ::GetMenuState(hMenu, i, MF_BYPOSITION);
|
||||||
|
if ( state == (UINT)-1 )
|
||||||
|
{
|
||||||
|
// This indicates that the item at this position and is not
|
||||||
|
// supposed to happen here, but test for it just in case.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( state & MF_POPUP )
|
||||||
|
{
|
||||||
|
if ( ::GetSubMenu(hMenu, i) == (HMENU)id )
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
else if ( !(state & MF_SEPARATOR) )
|
||||||
|
{
|
||||||
|
if ( ::GetMenuItemID(hMenu, i) == id )
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxMenuItemBase
|
// wxMenuItemBase
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
|
@ -413,6 +413,13 @@ void wxWindowsPrintNativeData::InitializeDevMode(const wxString& printerName, Wi
|
||||||
NULL, // these are not used.
|
NULL, // these are not used.
|
||||||
0 ); // Zero returns buffer size.
|
0 ); // Zero returns buffer size.
|
||||||
|
|
||||||
|
// Some buggy printer drivers (see #16274 which claims that Kyocera
|
||||||
|
// PCL6 driver does this) seem to return a too small value from
|
||||||
|
// DocumentProperties(), resulting in a crash because when we call
|
||||||
|
// it with DM_OUT_BUFFER below, memory beyond the allocated buffer
|
||||||
|
// is overwritten. So add a bit of extra memory to work around this.
|
||||||
|
dwNeeded += 1024;
|
||||||
|
|
||||||
LPDEVMODE tempDevMode = static_cast<LPDEVMODE>( GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, dwNeeded ) );
|
LPDEVMODE tempDevMode = static_cast<LPDEVMODE>( GlobalAlloc( GMEM_FIXED | GMEM_ZEROINIT, dwNeeded ) );
|
||||||
|
|
||||||
// Step 2:
|
// Step 2:
|
||||||
|
|
|
@ -76,9 +76,6 @@ bool wxStaticBox::Create(wxWindow *parent,
|
||||||
if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
|
if ( !MSWCreateControl(wxT("BUTTON"), label, pos, size) )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Always use LTR layout. Otherwise, the label would be mirrored.
|
|
||||||
SetLayoutDirection(wxLayout_LeftToRight);
|
|
||||||
|
|
||||||
#ifndef __WXWINCE__
|
#ifndef __WXWINCE__
|
||||||
if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
|
if (!wxSystemOptions::IsFalse(wxT("msw.staticbox.optimized-paint")))
|
||||||
{
|
{
|
||||||
|
@ -117,12 +114,6 @@ WXDWORD wxStaticBox::MSWGetStyle(long style, WXDWORD *exstyle) const
|
||||||
|
|
||||||
styleWin |= BS_GROUPBOX;
|
styleWin |= BS_GROUPBOX;
|
||||||
|
|
||||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
|
||||||
{
|
|
||||||
// Make sure label is on the right
|
|
||||||
styleWin |= BS_RIGHT;
|
|
||||||
}
|
|
||||||
|
|
||||||
return styleWin;
|
return styleWin;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -277,11 +268,26 @@ void wxStaticBox::MSWGetRegionWithoutSelf(WXHRGN hRgn, int w, int h)
|
||||||
SubtractRectFromRgn(hrgn, w - border, 0, w, h);
|
SubtractRectFromRgn(hrgn, w - border, 0, w, h);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
RECT AdjustRectForRtl(wxLayoutDirection dir, RECT const& childRect, RECT const& boxRect) {
|
||||||
|
RECT ret = childRect;
|
||||||
|
if( dir == wxLayout_RightToLeft ) {
|
||||||
|
// The clipping region too is mirrored in RTL layout.
|
||||||
|
// We need to mirror screen coordinates relative to static box window priot to
|
||||||
|
// intersecting with region.
|
||||||
|
ret.right = boxRect.right - childRect.left - boxRect.left;
|
||||||
|
ret.left = boxRect.right - childRect.right - boxRect.left;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
|
WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
|
||||||
{
|
{
|
||||||
RECT rc;
|
RECT boxRc;
|
||||||
::GetWindowRect(GetHwnd(), &rc);
|
::GetWindowRect(GetHwnd(), &boxRc);
|
||||||
HRGN hrgn = ::CreateRectRgn(rc.left, rc.top, rc.right + 1, rc.bottom + 1);
|
HRGN hrgn = ::CreateRectRgn(boxRc.left, boxRc.top, boxRc.right + 1, boxRc.bottom + 1);
|
||||||
bool foundThis = false;
|
bool foundThis = false;
|
||||||
|
|
||||||
// Iterate over all sibling windows as in the old wxWidgets API the
|
// Iterate over all sibling windows as in the old wxWidgets API the
|
||||||
|
@ -320,7 +326,9 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RECT rc;
|
||||||
::GetWindowRect(child, &rc);
|
::GetWindowRect(child, &rc);
|
||||||
|
rc = AdjustRectForRtl(GetLayoutDirection(), rc, boxRc );
|
||||||
if ( ::RectInRegion(hrgn, &rc) )
|
if ( ::RectInRegion(hrgn, &rc) )
|
||||||
{
|
{
|
||||||
// need to remove WS_CLIPSIBLINGS from all sibling windows
|
// need to remove WS_CLIPSIBLINGS from all sibling windows
|
||||||
|
@ -355,7 +363,9 @@ WXHRGN wxStaticBox::MSWGetRegionWithoutChildren()
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RECT rc;
|
||||||
::GetWindowRect(child, &rc);
|
::GetWindowRect(child, &rc);
|
||||||
|
rc = AdjustRectForRtl(GetLayoutDirection(), rc, boxRc );
|
||||||
AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
|
AutoHRGN hrgnChild(::CreateRectRgnIndirect(&rc));
|
||||||
::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
|
::CombineRgn(hrgn, hrgn, hrgnChild, RGN_DIFF);
|
||||||
}
|
}
|
||||||
|
@ -391,7 +401,7 @@ void wxStaticBox::PaintBackground(wxDC& dc, const RECT& rc)
|
||||||
::FillRect(GetHdcOf(*impl), &rc, hbr);
|
::FillRect(GetHdcOf(*impl), &rc, hbr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
|
void wxStaticBox::PaintForeground(wxDC& dc, const RECT&)
|
||||||
{
|
{
|
||||||
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
|
wxMSWDCImpl *impl = (wxMSWDCImpl*) dc.GetImpl();
|
||||||
MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
|
MSWDefWindowProc(WM_PAINT, (WPARAM)GetHdcOf(*impl), 0);
|
||||||
|
@ -407,10 +417,6 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
|
||||||
HDC hdc = GetHdcOf(*impl);
|
HDC hdc = GetHdcOf(*impl);
|
||||||
::SetTextColor(hdc, GetForegroundColour().GetPixel());
|
::SetTextColor(hdc, GetForegroundColour().GetPixel());
|
||||||
|
|
||||||
const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
|
|
||||||
if ( rtl )
|
|
||||||
::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
|
|
||||||
|
|
||||||
// Get dimensions of the label
|
// Get dimensions of the label
|
||||||
const wxString label = GetLabel();
|
const wxString label = GetLabel();
|
||||||
|
|
||||||
|
@ -458,18 +464,9 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
|
||||||
// FIXME: value of x is hardcoded as this is what it is on my system,
|
// FIXME: value of x is hardcoded as this is what it is on my system,
|
||||||
// no idea if it's true everywhere
|
// no idea if it's true everywhere
|
||||||
RECT dimensions = {0, 0, 0, y};
|
RECT dimensions = {0, 0, 0, y};
|
||||||
if ( !rtl )
|
|
||||||
{
|
|
||||||
x = 9;
|
x = 9;
|
||||||
dimensions.left = x;
|
dimensions.left = x;
|
||||||
dimensions.right = x + width;
|
dimensions.right = x + width;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
x = rc.right - 7;
|
|
||||||
dimensions.left = x - width;
|
|
||||||
dimensions.right = x;
|
|
||||||
}
|
|
||||||
|
|
||||||
// need to adjust the rectangle to cover all the label background
|
// need to adjust the rectangle to cover all the label background
|
||||||
dimensions.left -= 2;
|
dimensions.left -= 2;
|
||||||
|
@ -505,19 +502,10 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// now draw the text
|
// now draw the text
|
||||||
if ( !rtl )
|
|
||||||
{
|
|
||||||
RECT rc2 = { x, 0, x + width, y };
|
RECT rc2 = { x, 0, x + width, y };
|
||||||
::DrawText(hdc, label.t_str(), label.length(), &rc2,
|
::DrawText(hdc, label.t_str(), label.length(), &rc2,
|
||||||
drawTextFlags);
|
drawTextFlags);
|
||||||
}
|
}
|
||||||
else // RTL
|
|
||||||
{
|
|
||||||
RECT rc2 = { x, 0, x - width, y };
|
|
||||||
::DrawText(hdc, label.t_str(), label.length(), &rc2,
|
|
||||||
drawTextFlags | DT_RTLREADING);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif // wxUSE_UXTHEME
|
#endif // wxUSE_UXTHEME
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -525,9 +513,10 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
RECT rc;
|
RECT rc;
|
||||||
::GetClientRect(GetHwnd(), &rc);
|
::GetClientRect(GetHwnd(), &rc);
|
||||||
|
wxPaintDC dc(this);
|
||||||
|
|
||||||
// draw the entire box in a memory DC
|
// draw the entire box in a memory DC
|
||||||
wxMemoryDC memdc;
|
wxMemoryDC memdc(&dc);
|
||||||
wxBitmap bitmap(rc.right, rc.bottom);
|
wxBitmap bitmap(rc.right, rc.bottom);
|
||||||
memdc.SelectObject(bitmap);
|
memdc.SelectObject(bitmap);
|
||||||
|
|
||||||
|
@ -540,7 +529,6 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
|
||||||
// note that it seems to be faster to do 4 small blits here and then paint
|
// note that it seems to be faster to do 4 small blits here and then paint
|
||||||
// directly into wxPaintDC than painting background in wxMemoryDC and then
|
// directly into wxPaintDC than painting background in wxMemoryDC and then
|
||||||
// blitting everything at once to wxPaintDC, this is why we do it like this
|
// blitting everything at once to wxPaintDC, this is why we do it like this
|
||||||
wxPaintDC dc(this);
|
|
||||||
int borderTop, border;
|
int borderTop, border;
|
||||||
GetBordersForSizer(&borderTop, &border);
|
GetBordersForSizer(&borderTop, &border);
|
||||||
|
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include "wx/wxcrtvararg.h"
|
#include "wx/wxcrtvararg.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/scopedptr.h"
|
||||||
#include "wx/stack.h"
|
#include "wx/stack.h"
|
||||||
#include "wx/sysopt.h"
|
#include "wx/sysopt.h"
|
||||||
|
|
||||||
|
@ -68,8 +69,11 @@
|
||||||
// richedit.h at all
|
// richedit.h at all
|
||||||
#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
|
#if !defined(__GNUWIN32_OLD__) || defined(__CYGWIN10__)
|
||||||
#include <richedit.h>
|
#include <richedit.h>
|
||||||
|
#include <richole.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "wx/msw/ole/oleutils.h"
|
||||||
|
|
||||||
#endif // wxUSE_RICHEDIT
|
#endif // wxUSE_RICHEDIT
|
||||||
|
|
||||||
#include "wx/msw/missing.h"
|
#include "wx/msw/missing.h"
|
||||||
|
@ -88,6 +92,25 @@ static wxDropTarget *
|
||||||
|
|
||||||
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
#endif // wxUSE_DRAG_AND_DROP && wxUSE_RICHEDIT
|
||||||
|
|
||||||
|
#if wxUSE_OLE
|
||||||
|
// This must be the last header included to only affect the DEFINE_GUID()
|
||||||
|
// occurrences below but not any GUIDs declared in the standard files included
|
||||||
|
// above.
|
||||||
|
#include <initguid.h>
|
||||||
|
|
||||||
|
namespace
|
||||||
|
{
|
||||||
|
|
||||||
|
// Normally the IRichEditOleCallback interface and its IID are defined in
|
||||||
|
// richole.h header file included in the platform SDK but MinGW doesn't
|
||||||
|
// have the IID symbol (but does have the interface). Work around it by
|
||||||
|
// defining it ourselves.
|
||||||
|
DEFINE_GUID(wxIID_IRichEditOleCallback,
|
||||||
|
0x00020d03, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
|
||||||
|
|
||||||
|
} // anonymous namespace
|
||||||
|
#endif // wxUSE_OLE
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// private classes
|
// private classes
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -138,6 +161,73 @@ bool wxRichEditModule::ms_inkEditLibLoadAttemped = false;
|
||||||
|
|
||||||
IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
|
IMPLEMENT_DYNAMIC_CLASS(wxRichEditModule, wxModule)
|
||||||
|
|
||||||
|
#if wxUSE_OLE
|
||||||
|
|
||||||
|
extern wxMenu *wxCurrentPopupMenu;
|
||||||
|
|
||||||
|
class wxTextCtrlOleCallback : public IRichEditOleCallback
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
wxTextCtrlOleCallback(wxTextCtrl *text) : m_textCtrl(text), m_menu(NULL) {}
|
||||||
|
~wxTextCtrlOleCallback() { DeleteContextMenuObject(); }
|
||||||
|
|
||||||
|
STDMETHODIMP ContextSensitiveHelp(BOOL WXUNUSED(enterMode)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP DeleteObject(LPOLEOBJECT WXUNUSED(oleobj)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP GetClipboardData(CHARRANGE* WXUNUSED(chrg), DWORD WXUNUSED(reco), LPDATAOBJECT* WXUNUSED(dataobj)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP GetDragDropEffect(BOOL WXUNUSED(drag), DWORD WXUNUSED(grfKeyState), LPDWORD WXUNUSED(effect)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP GetInPlaceContext(LPOLEINPLACEFRAME* WXUNUSED(frame), LPOLEINPLACEUIWINDOW* WXUNUSED(doc), LPOLEINPLACEFRAMEINFO WXUNUSED(frameInfo)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP GetNewStorage(LPSTORAGE *WXUNUSED(stg)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP QueryAcceptData(LPDATAOBJECT WXUNUSED(dataobj), CLIPFORMAT* WXUNUSED(format), DWORD WXUNUSED(reco), BOOL WXUNUSED(really), HGLOBAL WXUNUSED(hMetaPict)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP QueryInsertObject(LPCLSID WXUNUSED(clsid), LPSTORAGE WXUNUSED(stg), LONG WXUNUSED(cp)) { return E_NOTIMPL; }
|
||||||
|
STDMETHODIMP ShowContainerUI(BOOL WXUNUSED(show)) { return E_NOTIMPL; }
|
||||||
|
|
||||||
|
STDMETHODIMP GetContextMenu(WORD WXUNUSED(seltype), LPOLEOBJECT WXUNUSED(oleobj), CHARRANGE* WXUNUSED(chrg), HMENU *menu)
|
||||||
|
{
|
||||||
|
// 'menu' will be shown and destroyed by the caller. We need to keep
|
||||||
|
// its wx counterpart, the wxMenu instance, around until it is
|
||||||
|
// dismissed, though, so store it in m_menu and destroy sometime later.
|
||||||
|
DeleteContextMenuObject();
|
||||||
|
m_menu = m_textCtrl->MSWCreateContextMenu();
|
||||||
|
*menu = m_menu->GetHMenu();
|
||||||
|
|
||||||
|
// Make wx handle events from the popup menu correctly:
|
||||||
|
m_menu->SetInvokingWindow(m_textCtrl);
|
||||||
|
wxCurrentPopupMenu = m_menu;
|
||||||
|
|
||||||
|
m_menu->UpdateUI();
|
||||||
|
|
||||||
|
return S_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
DECLARE_IUNKNOWN_METHODS;
|
||||||
|
|
||||||
|
private:
|
||||||
|
void DeleteContextMenuObject()
|
||||||
|
{
|
||||||
|
if ( m_menu )
|
||||||
|
{
|
||||||
|
m_menu->MSWDetachHMENU();
|
||||||
|
if ( wxCurrentPopupMenu == m_menu )
|
||||||
|
wxCurrentPopupMenu = NULL;
|
||||||
|
wxDELETE(m_menu);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wxTextCtrl *m_textCtrl;
|
||||||
|
wxMenu *m_menu;
|
||||||
|
|
||||||
|
wxDECLARE_NO_COPY_CLASS(wxTextCtrlOleCallback);
|
||||||
|
};
|
||||||
|
|
||||||
|
BEGIN_IID_TABLE(wxTextCtrlOleCallback)
|
||||||
|
ADD_IID(Unknown)
|
||||||
|
ADD_RAW_IID(wxIID_IRichEditOleCallback)
|
||||||
|
END_IID_TABLE;
|
||||||
|
|
||||||
|
IMPLEMENT_IUNKNOWN_METHODS(wxTextCtrlOleCallback)
|
||||||
|
|
||||||
|
#endif // wxUSE_OLE
|
||||||
|
|
||||||
#endif // wxUSE_RICHEDIT
|
#endif // wxUSE_RICHEDIT
|
||||||
|
|
||||||
// a small class used to set m_updatesCount to 0 (to filter duplicate events if
|
// a small class used to set m_updatesCount to 0 (to filter duplicate events if
|
||||||
|
@ -198,10 +288,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxTextCtrlBase)
|
||||||
EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
|
EVT_KEY_DOWN(wxTextCtrl::OnKeyDown)
|
||||||
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
|
EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
|
||||||
|
|
||||||
#if wxUSE_RICHEDIT
|
|
||||||
EVT_CONTEXT_MENU(wxTextCtrl::OnContextMenu)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
|
EVT_MENU(wxID_CUT, wxTextCtrl::OnCut)
|
||||||
EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
|
EVT_MENU(wxID_COPY, wxTextCtrl::OnCopy)
|
||||||
EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
|
EVT_MENU(wxID_PASTE, wxTextCtrl::OnPaste)
|
||||||
|
@ -492,6 +578,17 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
|
||||||
}
|
}
|
||||||
|
|
||||||
::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask);
|
::SendMessage(GetHwnd(), EM_SETEVENTMASK, 0, mask);
|
||||||
|
|
||||||
|
bool contextMenuConnected = false;
|
||||||
|
#if wxUSE_OLE
|
||||||
|
if ( m_verRichEdit >= 4 )
|
||||||
|
{
|
||||||
|
wxTextCtrlOleCallback *cb = new wxTextCtrlOleCallback(this);
|
||||||
|
contextMenuConnected = ::SendMessage(GetHwnd(), EM_SETOLECALLBACK, 0, (LPARAM)cb) != 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
if ( !contextMenuConnected )
|
||||||
|
Connect(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(wxTextCtrl::OnContextMenu));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif // wxUSE_RICHEDIT
|
#endif // wxUSE_RICHEDIT
|
||||||
|
@ -2323,32 +2420,6 @@ void wxTextCtrl::OnUpdateSelectAll(wxUpdateUIEvent& event)
|
||||||
event.Enable( !IsEmpty() );
|
event.Enable( !IsEmpty() );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
|
|
||||||
{
|
|
||||||
#if wxUSE_RICHEDIT
|
|
||||||
if (IsRich())
|
|
||||||
{
|
|
||||||
if (!m_privateContextMenu)
|
|
||||||
{
|
|
||||||
m_privateContextMenu = new wxMenu;
|
|
||||||
m_privateContextMenu->Append(wxID_UNDO, _("&Undo"));
|
|
||||||
m_privateContextMenu->Append(wxID_REDO, _("&Redo"));
|
|
||||||
m_privateContextMenu->AppendSeparator();
|
|
||||||
m_privateContextMenu->Append(wxID_CUT, _("Cu&t"));
|
|
||||||
m_privateContextMenu->Append(wxID_COPY, _("&Copy"));
|
|
||||||
m_privateContextMenu->Append(wxID_PASTE, _("&Paste"));
|
|
||||||
m_privateContextMenu->Append(wxID_CLEAR, _("&Delete"));
|
|
||||||
m_privateContextMenu->AppendSeparator();
|
|
||||||
m_privateContextMenu->Append(wxID_SELECTALL, _("Select &All"));
|
|
||||||
}
|
|
||||||
PopupMenu(m_privateContextMenu);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
event.Skip();
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
|
void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
|
||||||
{
|
{
|
||||||
// be sure the caret remains invisible if the user had hidden it
|
// be sure the caret remains invisible if the user had hidden it
|
||||||
|
@ -2363,6 +2434,34 @@ void wxTextCtrl::OnSetFocus(wxFocusEvent& event)
|
||||||
// the rest of the file only deals with the rich edit controls
|
// the rest of the file only deals with the rich edit controls
|
||||||
#if wxUSE_RICHEDIT
|
#if wxUSE_RICHEDIT
|
||||||
|
|
||||||
|
void wxTextCtrl::OnContextMenu(wxContextMenuEvent& event)
|
||||||
|
{
|
||||||
|
if (IsRich())
|
||||||
|
{
|
||||||
|
if (!m_privateContextMenu)
|
||||||
|
m_privateContextMenu = MSWCreateContextMenu();
|
||||||
|
PopupMenu(m_privateContextMenu);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
event.Skip();
|
||||||
|
}
|
||||||
|
|
||||||
|
wxMenu *wxTextCtrl::MSWCreateContextMenu()
|
||||||
|
{
|
||||||
|
wxMenu *m = new wxMenu;
|
||||||
|
m->Append(wxID_UNDO, _("&Undo"));
|
||||||
|
m->Append(wxID_REDO, _("&Redo"));
|
||||||
|
m->AppendSeparator();
|
||||||
|
m->Append(wxID_CUT, _("Cu&t"));
|
||||||
|
m->Append(wxID_COPY, _("&Copy"));
|
||||||
|
m->Append(wxID_PASTE, _("&Paste"));
|
||||||
|
m->Append(wxID_CLEAR, _("&Delete"));
|
||||||
|
m->AppendSeparator();
|
||||||
|
m->Append(wxID_SELECTALL, _("Select &All"));
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// EN_LINK processing
|
// EN_LINK processing
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@ -2718,6 +2817,24 @@ bool wxTextCtrl::MSWSetParaFormat(const wxTextAttr& style, long start, long end)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if wxUSE_RICHEDIT2
|
||||||
|
if ( style.HasParagraphSpacingAfter() )
|
||||||
|
{
|
||||||
|
pf.dwMask |= PFM_SPACEAFTER;
|
||||||
|
|
||||||
|
// Convert from 1/10 mm to TWIPS
|
||||||
|
pf.dySpaceAfter = (int) (((double) style.GetParagraphSpacingAfter()) * mm2twips / 10.0) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( style.HasParagraphSpacingBefore() )
|
||||||
|
{
|
||||||
|
pf.dwMask |= PFM_SPACEBEFORE;
|
||||||
|
|
||||||
|
// Convert from 1/10 mm to TWIPS
|
||||||
|
pf.dySpaceBefore = (int) (((double) style.GetParagraphSpacingBefore()) * mm2twips / 10.0) ;
|
||||||
|
}
|
||||||
|
#endif // wxUSE_RICHEDIT2
|
||||||
|
|
||||||
#if wxUSE_RICHEDIT2
|
#if wxUSE_RICHEDIT2
|
||||||
if ( m_verRichEdit > 1 )
|
if ( m_verRichEdit > 1 )
|
||||||
{
|
{
|
||||||
|
|
|
@ -3277,7 +3277,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||||
case TVN_BEGINLABELEDIT:
|
case TVN_BEGINLABELEDIT:
|
||||||
{
|
{
|
||||||
eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;
|
eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;
|
||||||
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
|
NMTVDISPINFO *info = (NMTVDISPINFO *)lParam;
|
||||||
|
|
||||||
// although the user event handler may still veto it, it is
|
// although the user event handler may still veto it, it is
|
||||||
// important to set it now so that calls to SetItemText() from
|
// important to set it now so that calls to SetItemText() from
|
||||||
|
@ -3311,7 +3311,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||||
case TVN_ENDLABELEDIT:
|
case TVN_ENDLABELEDIT:
|
||||||
{
|
{
|
||||||
eventType = wxEVT_TREE_END_LABEL_EDIT;
|
eventType = wxEVT_TREE_END_LABEL_EDIT;
|
||||||
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
|
NMTVDISPINFO *info = (NMTVDISPINFO *)lParam;
|
||||||
|
|
||||||
event.m_item = info->item.hItem;
|
event.m_item = info->item.hItem;
|
||||||
event.m_label = info->item.pszText;
|
event.m_label = info->item.pszText;
|
||||||
|
@ -3355,7 +3355,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||||
eventType = wxEVT_TREE_SET_INFO;
|
eventType = wxEVT_TREE_SET_INFO;
|
||||||
//else: get, already set above
|
//else: get, already set above
|
||||||
|
|
||||||
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
|
NMTVDISPINFO *info = (NMTVDISPINFO *)lParam;
|
||||||
|
|
||||||
event.m_item = info->item.hItem;
|
event.m_item = info->item.hItem;
|
||||||
break;
|
break;
|
||||||
|
@ -3857,7 +3857,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
||||||
//if ( /* !processed && */ )
|
//if ( /* !processed && */ )
|
||||||
{
|
{
|
||||||
wxTreeItemId item = event.m_item;
|
wxTreeItemId item = event.m_item;
|
||||||
TV_DISPINFO *info = (TV_DISPINFO *)lParam;
|
NMTVDISPINFO *info = (NMTVDISPINFO *)lParam;
|
||||||
|
|
||||||
const wxTreeItemParam * const param = GetItemParam(item);
|
const wxTreeItemParam * const param = GetItemParam(item);
|
||||||
if ( !param )
|
if ( !param )
|
||||||
|
|
|
@ -1488,6 +1488,13 @@ wxWinVersion wxGetWinVersion()
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
return wxWinVersion_8;
|
return wxWinVersion_8;
|
||||||
|
|
||||||
|
case 3:
|
||||||
|
// For now, map to wxWinVersion_8. In case program
|
||||||
|
// does not have a manifest indicating 8.1
|
||||||
|
// support, Windows already performs this mapping
|
||||||
|
// for us.
|
||||||
|
return wxWinVersion_8;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -960,13 +960,13 @@ bool wxWebViewIE::IsElementVisible(wxCOMPtr<IHTMLElement> elm)
|
||||||
{
|
{
|
||||||
//Check if the object has the style display:none.
|
//Check if the object has the style display:none.
|
||||||
if((style->get_display(&tmp_bstr) != S_OK) ||
|
if((style->get_display(&tmp_bstr) != S_OK) ||
|
||||||
(tmp_bstr != NULL && (_wcsicmp(tmp_bstr, L"none") == 0)))
|
(tmp_bstr != NULL && (wxCRT_StricmpW(tmp_bstr, L"none") == 0)))
|
||||||
{
|
{
|
||||||
is_visible = false;
|
is_visible = false;
|
||||||
}
|
}
|
||||||
//Check if the object has the style visibility:hidden.
|
//Check if the object has the style visibility:hidden.
|
||||||
if((is_visible && (style->get_visibility(&tmp_bstr) != S_OK)) ||
|
if((is_visible && (style->get_visibility(&tmp_bstr) != S_OK)) ||
|
||||||
(tmp_bstr != NULL && _wcsicmp(tmp_bstr, L"hidden") == 0))
|
(tmp_bstr != NULL && wxCRT_StricmpW(tmp_bstr, L"hidden") == 0))
|
||||||
{
|
{
|
||||||
is_visible = false;
|
is_visible = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1145,6 +1145,11 @@ void wxWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
|
||||||
if ( styleNew != styleOld )
|
if ( styleNew != styleOld )
|
||||||
{
|
{
|
||||||
wxSetWindowExStyle(this, styleNew);
|
wxSetWindowExStyle(this, styleNew);
|
||||||
|
|
||||||
|
// Update layout: whether we have children or are drawing something, we
|
||||||
|
// need to redo it with the new layout.
|
||||||
|
SendSizeEvent();
|
||||||
|
Refresh();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -1837,31 +1842,18 @@ void wxWindowMSW::DoGetPosition(int *x, int *y) const
|
||||||
{
|
{
|
||||||
RECT rect = wxGetWindowRect(GetHwnd());
|
RECT rect = wxGetWindowRect(GetHwnd());
|
||||||
|
|
||||||
POINT point;
|
|
||||||
point.x = rect.left;
|
|
||||||
point.y = rect.top;
|
|
||||||
|
|
||||||
// we do the adjustments with respect to the parent only for the "real"
|
// we do the adjustments with respect to the parent only for the "real"
|
||||||
// children, not for the dialogs/frames
|
// children, not for the dialogs/frames
|
||||||
if ( !IsTopLevel() )
|
if ( !IsTopLevel() )
|
||||||
{
|
|
||||||
if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
|
|
||||||
{
|
{
|
||||||
// In RTL mode, we want the logical left x-coordinate,
|
// In RTL mode, we want the logical left x-coordinate,
|
||||||
// which would be the physical right x-coordinate.
|
// which would be the physical right x-coordinate.
|
||||||
point.x = rect.right;
|
::MapWindowPoints(NULL, parent ? GetHwndOf(parent) : HWND_DESKTOP,
|
||||||
|
(LPPOINT)&rect, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Since we now have the absolute screen coords, if there's a
|
pos.x = rect.left;
|
||||||
// parent we must subtract its top left corner
|
pos.y = rect.top;
|
||||||
if ( parent )
|
|
||||||
{
|
|
||||||
::ScreenToClient(GetHwndOf(parent), &point);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pos.x = point.x;
|
|
||||||
pos.y = point.y;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// we also must adjust by the client area offset: a control which is just
|
// we also must adjust by the client area offset: a control which is just
|
||||||
|
@ -2128,11 +2120,11 @@ wxSize wxWindowMSW::DoGetBorderSize() const
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxBORDER_SUNKEN:
|
case wxBORDER_SUNKEN:
|
||||||
|
case wxBORDER_THEME:
|
||||||
border = 2;
|
border = 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case wxBORDER_RAISED:
|
case wxBORDER_RAISED:
|
||||||
case wxBORDER_DOUBLE:
|
|
||||||
border = 3;
|
border = 3;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -2450,7 +2442,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( btn && btn->IsEnabled() )
|
if ( btn && btn->IsEnabled() && btn->IsShownOnScreen() )
|
||||||
{
|
{
|
||||||
btn->MSWCommand(BN_CLICKED, 0 /* unused */);
|
btn->MSWCommand(BN_CLICKED, 0 /* unused */);
|
||||||
return true;
|
return true;
|
||||||
|
@ -2499,7 +2491,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ::IsDialogMessage(GetHwnd(), msg) )
|
if ( MSWSafeIsDialogMessage(msg) )
|
||||||
{
|
{
|
||||||
// IsDialogMessage() did something...
|
// IsDialogMessage() did something...
|
||||||
return true;
|
return true;
|
||||||
|
@ -2530,12 +2522,16 @@ bool wxWindowMSW::MSWTranslateMessage(WXMSG* pMsg)
|
||||||
#endif // wxUSE_ACCEL
|
#endif // wxUSE_ACCEL
|
||||||
}
|
}
|
||||||
|
|
||||||
bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* WXUNUSED(msg))
|
||||||
{
|
{
|
||||||
// all tests below have to deal with various bugs/misfeatures of
|
// We don't have any reason to not preprocess messages at this level.
|
||||||
// IsDialogMessage(): we have to prevent it from being called from our
|
return true;
|
||||||
// MSWProcessMessage() in some situations
|
}
|
||||||
|
|
||||||
|
#ifndef __WXUNIVERSAL__
|
||||||
|
|
||||||
|
bool wxWindowMSW::MSWSafeIsDialogMessage(WXMSG* msg)
|
||||||
|
{
|
||||||
// don't let IsDialogMessage() get VK_ESCAPE as it _always_ eats the
|
// don't let IsDialogMessage() get VK_ESCAPE as it _always_ eats the
|
||||||
// message even when there is no cancel button and when the message is
|
// message even when there is no cancel button and when the message is
|
||||||
// needed by the control itself: in particular, it prevents the tree in
|
// needed by the control itself: in particular, it prevents the tree in
|
||||||
|
@ -2549,12 +2545,8 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
||||||
// going into an infinite loop when it tries to find the control to give
|
// going into an infinite loop when it tries to find the control to give
|
||||||
// focus to when Alt-<key> is pressed, so we try to detect [some of] the
|
// focus to when Alt-<key> is pressed, so we try to detect [some of] the
|
||||||
// situations when this may happen and not call it then
|
// situations when this may happen and not call it then
|
||||||
if ( msg->message != WM_SYSCHAR )
|
if ( msg->message == WM_SYSCHAR )
|
||||||
return true;
|
{
|
||||||
|
|
||||||
// assume we can call it by default
|
|
||||||
bool canSafelyCallIsDlgMsg = true;
|
|
||||||
|
|
||||||
HWND hwndFocus = ::GetFocus();
|
HWND hwndFocus = ::GetFocus();
|
||||||
|
|
||||||
// if the currently focused window itself has WS_EX_CONTROLPARENT style,
|
// if the currently focused window itself has WS_EX_CONTROLPARENT style,
|
||||||
|
@ -2571,7 +2563,7 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
||||||
if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT )
|
if ( ::GetWindowLong(hwndFocus, GWL_EXSTYLE) & WS_EX_CONTROLPARENT )
|
||||||
{
|
{
|
||||||
// pessimistic by default
|
// pessimistic by default
|
||||||
canSafelyCallIsDlgMsg = false;
|
bool canSafelyCallIsDlgMsg = false;
|
||||||
for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
|
for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
|
||||||
node;
|
node;
|
||||||
node = node->GetNext() )
|
node = node->GetNext() )
|
||||||
|
@ -2586,11 +2578,12 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !canSafelyCallIsDlgMsg )
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
#endif // !__WXWINCE__
|
#endif // !__WXWINCE__
|
||||||
|
|
||||||
if ( canSafelyCallIsDlgMsg )
|
|
||||||
{
|
|
||||||
// ::IsDialogMessage() can enter in an infinite loop when the
|
// ::IsDialogMessage() can enter in an infinite loop when the
|
||||||
// currently focused window is disabled or hidden and its
|
// currently focused window is disabled or hidden and its
|
||||||
// parent has WS_EX_CONTROLPARENT style, so don't call it in
|
// parent has WS_EX_CONTROLPARENT style, so don't call it in
|
||||||
|
@ -2601,9 +2594,7 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
||||||
!::IsWindowVisible(hwndFocus) )
|
!::IsWindowVisible(hwndFocus) )
|
||||||
{
|
{
|
||||||
// it would enter an infinite loop if we do this!
|
// it would enter an infinite loop if we do this!
|
||||||
canSafelyCallIsDlgMsg = false;
|
return false;
|
||||||
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !(::GetWindowLong(hwndFocus, GWL_STYLE) & WS_CHILD) )
|
if ( !(::GetWindowLong(hwndFocus, GWL_STYLE) & WS_CHILD) )
|
||||||
|
@ -2618,9 +2609,11 @@ bool wxWindowMSW::MSWShouldPreProcessMessage(WXMSG* msg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return canSafelyCallIsDlgMsg;
|
return ::IsDialogMessage(GetHwnd(), msg) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // __WXUNIVERSAL__
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
// message params unpackers
|
// message params unpackers
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
@ -3491,6 +3484,29 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
|
||||||
|
case WM_INITMENUPOPUP:
|
||||||
|
case WM_MENUSELECT:
|
||||||
|
case WM_EXITMENULOOP:
|
||||||
|
case WM_UNINITMENUPOPUP:
|
||||||
|
{
|
||||||
|
// Contrary to MSDN implications, at least some of these messages are
|
||||||
|
// not actually sent to the TLW for popup menus, but to the owning
|
||||||
|
// window or even its parent window.
|
||||||
|
//
|
||||||
|
// wx-3.1+ handles these messages in wxWindow instead, but binary
|
||||||
|
// compatibility requirements on wx-3.0 make it simpler to just forward
|
||||||
|
// the messages to the wxTLW.
|
||||||
|
wxWindow *tlw = wxGetTopLevelParent(this);
|
||||||
|
if (tlw && tlw != this)
|
||||||
|
{
|
||||||
|
rc.result = tlw->MSWWindowProc(message, wParam, lParam);
|
||||||
|
processed = rc.result == 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#endif // !__WXMICROWIN__
|
||||||
#endif // wxUSE_MENUS
|
#endif // wxUSE_MENUS
|
||||||
|
|
||||||
#ifndef __WXWINCE__
|
#ifndef __WXWINCE__
|
||||||
|
|
Loading…
Reference in New Issue