dasher r3494 - in trunk: Doc/development Src/DasherCore Src/Win32 Src/Win32/Widgets Utils/Win32/InnoSetup Utils/Win32/WiX
- From: pcowans svn gnome org
- To: svn-commits-list gnome org
- Subject: dasher r3494 - in trunk: Doc/development Src/DasherCore Src/Win32 Src/Win32/Widgets Utils/Win32/InnoSetup Utils/Win32/WiX
- Date: Sun, 6 Apr 2008 15:52:14 +0100 (BST)
Author: pcowans
Date: Sun Apr 6 15:52:14 2008
New Revision: 3494
URL: http://svn.gnome.org/viewvc/dasher?rev=3494&view=rev
Log:
* Updated release process documentation
* Removed obsolete installer files
* Half-completed attempt to make Japanese support work on Windows again.
Removed:
trunk/Utils/Win32/InnoSetup/
trunk/Utils/Win32/WiX/
Modified:
trunk/Doc/development/releasing.txt
trunk/Src/DasherCore/DasherCore_vc80.vcproj
trunk/Src/Win32/DasherWindow.cpp
trunk/Src/Win32/Widgets/Splitter.cpp
Modified: trunk/Doc/development/releasing.txt
==============================================================================
--- trunk/Doc/development/releasing.txt (original)
+++ trunk/Doc/development/releasing.txt Sun Apr 6 15:52:14 2008
@@ -1,7 +1,7 @@
Dasher Release Instructions
---------------------------
-Last Updated 9th Jul 2006 by Phil Cowans.
+Last Updated 6th Apr 2008 by Phil Cowans.
How to make a Dasher release. Note that most of this only makes sense
if your're the Dasher maintainer, ie me!:
@@ -16,14 +16,15 @@
a) configure.in
- b) Win32 resources files - both in the 'about' dialogue box and in
+ b) Win32 resources file (Src/Win32/Dasher.rc) - both in the 'about' dialogue box and in
the version information structure.
c) README
- d) Docs/LICENSE.txt
-
- e) Inno Setup script
+ d) WiX installer definition files:
+ - Src/Installer/Dasher.wxs
+ - Src/InstallerW2K/Dasher.wxs (Windows 2K compatibility version)
+ - Src/InstallerTobii/Dasher.wxs (MyTobii customised installer)
4. Add an item to the ChangeLog and NEWS files
@@ -37,21 +38,18 @@
8. Copy the tarball to a Windows machine, build 'Unicode Release',
check it works.
-9. Build Windows installer package and .debs.
+9. Build Windows installer package(s).
-10. Commit to CVS, tag CVS with release.
+10. Commit to SVN, tag SVN with release.
-11. Bump version numbers, commit to CVS again.
+11. Bump version numbers, commit to SVN again.
-12. Copy everything to Inference website, rebuild website.
+12. Copy everything to download website.
13. Upload tarball to GNOME servers and install.
14. Send announcement email
-15. Update local Inference group repository, run an upgrade on all of
- the machines in the cluster.
-
----
Send announcements to:
Modified: trunk/Src/DasherCore/DasherCore_vc80.vcproj
==============================================================================
--- trunk/Src/DasherCore/DasherCore_vc80.vcproj (original)
+++ trunk/Src/DasherCore/DasherCore_vc80.vcproj Sun Apr 6 15:52:14 2008
@@ -97,9 +97,9 @@
/>
</Configuration>
<Configuration
- Name="Release|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug|Win32"
+ OutputDirectory=".\Target/Debug"
+ IntermediateDirectory=".\Target/Debug/Intermediate"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -120,32 +120,30 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Release/Intermediate/"
- ObjectFile=".\Target/Release/Intermediate/"
- ProgramDataBaseFileName=".\Target/Release/Intermediate/"
+ Optimization="0"
+ AdditionalIncludeDirectories=""C:\Program Files\Expat 2.0.1\Source\lib""
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ TreatWChar_tAsBuiltInType="false"
+ PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Debug/Intermediate/"
+ ObjectFile=".\Target/Debug/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -154,7 +152,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Release\DasherCore.lib"
+ OutputFile=".\Target/Debug\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -167,24 +165,16 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
</Configuration>
<Configuration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Mobile Debug|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -205,32 +195,29 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- ExecutionBucket="7"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Release/Intermediate/"
- ObjectFile=".\Target/Release/Intermediate/"
- ProgramDataBaseFileName=".\Target/Release/Intermediate/"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ TreatWChar_tAsBuiltInType="false"
+ PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Debug/Intermediate/"
+ ObjectFile=".\Target/Debug/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -239,7 +226,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Release\DasherCore.lib"
+ OutputFile=".\Target/Debug\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -252,24 +239,16 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCCodeSignTool"
+ Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
- <DeploymentTool
- ForceDirty="-1"
- RemoteDirectory=""
- RegisterOutput="0"
- AdditionalFiles=""
- />
- <DebuggerTool
- />
</Configuration>
<Configuration
- Name="Debug|Win32"
- OutputDirectory=".\Target/Debug"
- IntermediateDirectory=".\Target/Debug/Intermediate"
+ Name="Release (W2K)|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -293,27 +272,28 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
AdditionalIncludeDirectories=""C:\Program Files\Expat 2.0.1\Source\lib""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- TreatWChar_tAsBuiltInType="false"
- PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Debug/Intermediate/"
- ObjectFile=".\Target/Debug/Intermediate/"
- ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
- BrowseInformation="1"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Release/Intermediate/"
+ ObjectFile=".\Target/Release/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Release/Intermediate/"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -322,7 +302,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Debug\DasherCore.lib"
+ OutputFile=".\Target/Release\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -342,7 +322,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|Pocket PC 2003 (ARMV4)"
+ Name="Release|Pocket PC 2003 (ARMV4)"
OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="4"
@@ -370,25 +350,27 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
- RuntimeLibrary="1"
- TreatWChar_tAsBuiltInType="false"
- PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Debug/Intermediate/"
- ObjectFile=".\Target/Debug/Intermediate/"
- ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
- BrowseInformation="1"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Release/Intermediate/"
+ ObjectFile=".\Target/Release/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Release/Intermediate/"
WarningLevel="3"
SuppressStartupBanner="true"
- EnableFloatingPointEmulation="false"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -397,7 +379,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Debug\DasherCore.lib"
+ OutputFile=".\Target/Release\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -425,7 +407,7 @@
/>
</Configuration>
<Configuration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
@@ -453,24 +435,27 @@
<Tool
Name="VCCLCompilerTool"
ExecutionBucket="7"
- Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
- RuntimeLibrary="1"
- TreatWChar_tAsBuiltInType="false"
- PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Debug/Intermediate/"
- ObjectFile=".\Target/Debug/Intermediate/"
- ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
- BrowseInformation="1"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
+ StringPooling="true"
+ RuntimeLibrary="0"
+ EnableFunctionLevelLinking="true"
+ PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Release/Intermediate/"
+ ObjectFile=".\Target/Release/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Release/Intermediate/"
WarningLevel="3"
SuppressStartupBanner="true"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
@@ -479,7 +464,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Debug\DasherCore.lib"
+ OutputFile=".\Target/Release\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -507,9 +492,9 @@
/>
</Configuration>
<Configuration
- Name="Mobile Debug|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -530,12 +515,13 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
+ ExecutionBucket="7"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
- BasicRuntimeChecks="3"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="false"
PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
@@ -545,7 +531,7 @@
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="4"
+ EnableFloatingPointEmulation="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -574,16 +560,24 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
<Configuration
- Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
- OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
- IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -610,8 +604,7 @@
Name="VCCLCompilerTool"
ExecutionBucket="7"
Optimization="0"
- AdditionalIncludeDirectories=""C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib""
- PreprocessorDefinitions="WIN32;_WIN32_WCE; ARM;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="false"
PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
@@ -621,7 +614,6 @@
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- EnableFloatingPointEmulation="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -665,9 +657,9 @@
/>
</Configuration>
<Configuration
- Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
- IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
+ OutputDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
+ IntermediateDirectory="Pocket PC 2003 (ARMV4)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -695,7 +687,7 @@
ExecutionBucket="7"
Optimization="0"
AdditionalIncludeDirectories=""C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib""
- PreprocessorDefinitions="WIN32;_DEBUG;_STATIC;_LIB;_UNICODE;_WIN32_WCE=0x501;_ARM_;WINCE;UNDER_CE"
+ PreprocessorDefinitions="WIN32;_WIN32_WCE; ARM;_DEBUG;_WINDOWS;_STATIC;_LIB;_UNICODE"
RuntimeLibrary="1"
TreatWChar_tAsBuiltInType="false"
PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
@@ -705,8 +697,7 @@
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="3"
- ShowIncludes="false"
+ EnableFloatingPointEmulation="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -721,6 +712,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="imm32.lib"
OutputFile=".\Target/Debug\DasherCore.lib"
SuppressStartupBanner="true"
/>
@@ -749,9 +741,9 @@
/>
</Configuration>
<Configuration
- Name="Release (W2K)|Win32"
- OutputDirectory="$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ OutputDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
+ IntermediateDirectory="Windows Mobile 5.0 Pocket PC SDK (ARMV4I)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
@@ -772,31 +764,32 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="1"
/>
<Tool
Name="VCCLCompilerTool"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories=""C:\Program Files\Expat 2.0.1\Source\lib""
- PreprocessorDefinitions="WIN32,_WINDOWS,NDEBUG,_LIB,_STATIC,_UNICODE"
- StringPooling="true"
- RuntimeLibrary="0"
- EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Target/Win32 Unicode Release/Intermediate/DasherCore.pch"
- AssemblerListingLocation=".\Target/Release/Intermediate/"
- ObjectFile=".\Target/Release/Intermediate/"
- ProgramDataBaseFileName=".\Target/Release/Intermediate/"
+ ExecutionBucket="7"
+ Optimization="0"
+ AdditionalIncludeDirectories=""C:\Documents and Settings\Philip Cowans\My Documents\SVN Stuff\trunk\Src\Common\Expat\lib""
+ PreprocessorDefinitions="WIN32;_DEBUG;_STATIC;_LIB;_UNICODE;_WIN32_WCE=0x501;_ARM_;WINCE;UNDER_CE"
+ RuntimeLibrary="1"
+ TreatWChar_tAsBuiltInType="false"
+ PrecompiledHeaderFile=".\Target/Debug/Intermediate/DasherCore.pch"
+ AssemblerListingLocation=".\Target/Debug/Intermediate/"
+ ObjectFile=".\Target/Debug/Intermediate/"
+ ProgramDataBaseFileName=".\Target/Debug/Intermediate/"
+ BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
+ ShowIncludes="false"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
@@ -804,8 +797,7 @@
/>
<Tool
Name="VCLibrarianTool"
- AdditionalDependencies="imm32.lib"
- OutputFile=".\Target/Release\DasherCore.lib"
+ OutputFile=".\Target/Debug\DasherCore.lib"
SuppressStartupBanner="true"
/>
<Tool
@@ -818,11 +810,19 @@
Name="VCBscMakeTool"
/>
<Tool
- Name="VCFxCopTool"
+ Name="VCCodeSignTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
+ <DeploymentTool
+ ForceDirty="-1"
+ RemoteDirectory=""
+ RegisterOutput="0"
+ AdditionalFiles=""
+ />
+ <DebuggerTool
+ />
</Configuration>
<Configuration
Name="Release (W2K)|Pocket PC 2003 (ARMV4)"
@@ -1049,7 +1049,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1057,7 +1057,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Mobile Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1065,7 +1065,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release (W2K)|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1073,7 +1073,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
+ Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1081,7 +1081,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1089,7 +1089,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Win32"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1097,7 +1097,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1105,7 +1105,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1113,7 +1113,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release (W2K)|Win32"
+ Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1153,7 +1153,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1161,7 +1161,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Mobile Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1169,7 +1169,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release (W2K)|Win32"
>
<Tool
Name="VCCLCompilerTool"
@@ -1177,7 +1177,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
+ Name="Release|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1185,7 +1185,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1193,7 +1193,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Win32"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1201,7 +1201,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1209,7 +1209,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
>
<Tool
Name="VCCLCompilerTool"
@@ -1217,7 +1217,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Release (W2K)|Win32"
+ Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
>
<Tool
Name="VCCLCompilerTool"
@@ -2025,68 +2025,19 @@
<File
RelativePath=".\IMEConversionHelper.cpp"
>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Mobile Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Mobile Debug|Pocket PC 2003 (ARMV4)"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
</File>
<File
RelativePath=".\IMEConversionHelper.h"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Pocket PC 2003 (ARMV4)"
+ Name="Mobile Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -2094,7 +2045,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+ Name="Debug|Pocket PC 2003 (ARMV4)"
ExcludedFromBuild="true"
>
<Tool
@@ -2102,7 +2053,7 @@
/>
</FileConfiguration>
<FileConfiguration
- Name="Mobile Debug|Win32"
+ Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
ExcludedFromBuild="true"
>
<Tool
Modified: trunk/Src/Win32/DasherWindow.cpp
==============================================================================
--- trunk/Src/Win32/DasherWindow.cpp (original)
+++ trunk/Src/Win32/DasherWindow.cpp Sun Apr 6 15:52:14 2008
@@ -538,10 +538,10 @@
LRESULT CDasherWindow::OnSize(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
if(wParam == SIZE_MINIMIZED)
return 0;
-
- m_pToolbar->Resize();
-// m_pSlidebar->Resize();
-
+
+ if(m_pToolbar)
+ m_pToolbar->Resize();
+
Layout();
return 0;
@@ -614,9 +614,15 @@
else
SpeedAlphabetHeight = 0;
- int GameGroupHeight = m_pGameGroup->GetHeight();
- int GameGroupWidth = m_pGameGroup->GetWidth();
- int GameLabelHeight = m_pGameGroup->GetLabelHeight();
+ int GameGroupHeight = 0;
+ int GameGroupWidth = 0;
+ int GameLabelHeight = 0;
+
+ if(m_pGameGroup) {
+ GameGroupHeight = m_pGameGroup->GetHeight();
+ GameGroupWidth = m_pGameGroup->GetWidth();
+ GameLabelHeight = m_pGameGroup->GetLabelHeight();
+ }
int MaxCanvas = Height - SpeedAlphabetHeight*2;
int CurY = ToolbarHeight;
Modified: trunk/Src/Win32/Widgets/Splitter.cpp
==============================================================================
--- trunk/Src/Win32/Widgets/Splitter.cpp (original)
+++ trunk/Src/Win32/Widgets/Splitter.cpp Sun Apr 6 15:52:14 2008
@@ -9,6 +9,9 @@
#include "WinCommon.h"
#include "Splitter.h"
+#include <iostream>
+#include <cstring>
+
// For WinCE
#ifndef MAKEPOINTS
#define MAKEPOINTS(l) (*((POINTS FAR *) & (l)))
@@ -79,13 +82,16 @@
#ifndef _WIN32_WCE
m_iPos = MousePos.y - GetSystemMetrics(SM_CYSIZEFRAME) / 2;
#else
- // TODO: Fix this on Windows CE
- m_iPos = MousePos.y - 4;
+ // TODO: Fix this on Windows CE
+ m_iPos = MousePos.y - 4;
#endif
- // Layout();
+
+// WCHAR wszDebugText[128];
+// _snwprintf(wszDebugText, 128, L"Setting size: %d\n", m_iPos);
+// OutputDebugStringW(wszDebugText);
+
m_pOwner->Layout();
}
return 0;
}
/////////////////////////////////////////////////////////////////////////////
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
