GNOME.org
 

[dasher] Fix Visual Studio 2005 build.

commit 2ce80500877b1ff5d84966d0ba9239d21643729c
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Sat Dec 5 14:29:39 2009 +0000

    Fix Visual Studio 2005 build.

 ChangeLog                               |    4 +
 Src/Common/Common_vc80.vcproj           |    8 +++
 Src/DasherCore/DasherCore_vc80.vcproj   |  100 ++++++++++++++++++++++++-------
 Src/DasherCore/DasherGameMode.cpp       |   23 ++++---
 Src/Installer/Dasher.wxs                |    8 ++-
 Src/Win32/Dasher_vc80.sln               |    2 +-
 Src/Win32/ModuleControl.h               |    4 +-
 Src/Win32/ModuleControlBool.cpp         |    4 +-
 Src/Win32/ModuleControlBool.h           |    4 +-
 Src/Win32/ModuleControlLong.cpp         |    4 +-
 Src/Win32/ModuleControlLong.h           |    4 +-
 Src/Win32/ModuleControlLongSpin.cpp     |    4 +-
 Src/Win32/ModuleControlLongSpin.h       |    4 +-
 Src/Win32/ModuleControlString.cpp       |    4 +-
 Src/Win32/ModuleControlString.h         |    4 +-
 Src/Win32/ModuleSettings.cpp            |    2 +-
 Src/Win32/ModuleSettings.h              |    4 +-
 Src/Win32/TabletPC/InkCollectorEvents.h |    2 +-
 Src/Win32/Widgets/AdvancedPage.h        |    2 +-
 Src/Win32/Widgets/AlphabetBox.h         |    6 +-
 Src/Win32/Widgets/Canvas.cpp            |    2 +-
 Src/Win32/Widgets/Canvas.h              |    2 +-
 Src/Win32/Widgets/ColourBox.h           |    4 +-
 Src/Win32/Widgets/ControlPage.h         |    2 +-
 Src/Win32/Widgets/GameGroup.cpp         |    8 +-
 Src/Win32/Widgets/LMPage.h              |    2 +-
 Src/Win32/Widgets/PrefsPageBase.h       |    4 +-
 Src/Win32/Widgets/Slidebar.h            |    2 +-
 Src/Win32/Widgets/StatusControl.cpp     |    2 +-
 Src/Win32/Widgets/StatusControl.h       |    4 +-
 Src/Win32/Widgets/Toolbar.h             |    2 +-
 Src/Win32/Widgets/ViewPage.cpp          |    2 +-
 Src/Win32/Widgets/ViewPage.h            |    4 +-
 33 files changed, 157 insertions(+), 80 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a84609c..c92b59e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-05  Patrick Welche <prlw1 cam ac uk>
+
+	* Fix Visual Studio 2005 build
+
 2009-12-04  Patrick Welche <prlw1 cam ac uk>
 
 	* da.po: Work around old gettext bug
diff --git a/Src/Common/Common_vc80.vcproj b/Src/Common/Common_vc80.vcproj
index c816d03..05a1982 100644
--- a/Src/Common/Common_vc80.vcproj
+++ b/Src/Common/Common_vc80.vcproj
@@ -1035,6 +1035,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\SBTree.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\SBTree.h"
+			>
+		</File>
+		<File
 			RelativePath="Trace.cpp"
 			>
 		</File>
diff --git a/Src/DasherCore/DasherCore_vc80.vcproj b/Src/DasherCore/DasherCore_vc80.vcproj
index 9af7443..1d65cfa 100644
--- a/Src/DasherCore/DasherCore_vc80.vcproj
+++ b/Src/DasherCore/DasherCore_vc80.vcproj
@@ -1246,6 +1246,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\LanguageModelling\PPMPYLanguageModel.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LanguageModelling\PPMPYLanguageModel.h"
+				>
+			</File>
+			<File
 				RelativePath="LanguageModelling\WordLanguageModel.cpp"
 				>
 			</File>
@@ -1767,27 +1775,27 @@
 			>
 		</File>
 		<File
-			RelativePath=".\AlphabetManagerFactory.cpp"
+			RelativePath="Alphabet\AlphabetMap.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\AlphabetManagerFactory.h"
+			RelativePath="Alphabet\AlphabetMap.h"
 			>
 		</File>
 		<File
-			RelativePath="Alphabet\AlphabetMap.cpp"
+			RelativePath="Alphabet\AlphIO.cpp"
 			>
 		</File>
 		<File
-			RelativePath="Alphabet\AlphabetMap.h"
+			RelativePath="Alphabet\AlphIO.h"
 			>
 		</File>
 		<File
-			RelativePath="Alphabet\AlphIO.cpp"
+			RelativePath=".\AlternatingDirectMode.cpp"
 			>
 		</File>
 		<File
-			RelativePath="Alphabet\AlphIO.h"
+			RelativePath=".\AlternatingDirectMode.h"
 			>
 		</File>
 		<File
@@ -1799,6 +1807,22 @@
 			>
 		</File>
 		<File
+			RelativePath=".\ButtonMode.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\ButtonMode.h"
+			>
+		</File>
+		<File
+			RelativePath=".\ButtonMultiPress.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\ButtonMultiPress.h"
+			>
+		</File>
+		<File
 			RelativePath=".\ClickFilter.cpp"
 			>
 		</File>
@@ -1815,39 +1839,35 @@
 			>
 		</File>
 		<File
-			RelativePath=".\ControlManager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ControlManager.h"
+			RelativePath=".\CompassMode.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\ControlManagerFactory.cpp"
+			RelativePath=".\CompassMode.h"
 			>
 		</File>
 		<File
-			RelativePath=".\ControlManagerFactory.h"
+			RelativePath=".\ControlManager.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\ConversionHelper.h"
+			RelativePath=".\ControlManager.h"
 			>
 		</File>
 		<File
-			RelativePath=".\ConversionManager.cpp"
+			RelativePath=".\ConversionHelper.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\ConversionManager.h"
+			RelativePath=".\ConversionHelper.h"
 			>
 		</File>
 		<File
-			RelativePath=".\ConversionManagerFactory.cpp"
+			RelativePath=".\ConversionManager.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\ConversionManagerFactory.h"
+			RelativePath=".\ConversionManager.h"
 			>
 		</File>
 		<File
@@ -1935,10 +1955,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\DasherView.inl"
-			>
-		</File>
-		<File
 			RelativePath=".\DasherViewSquare.cpp"
 			>
 		</File>
@@ -1995,6 +2011,10 @@
 			>
 		</File>
 		<File
+			RelativePath=".\FrameRate.cpp"
+			>
+		</File>
+		<File
 			RelativePath="FrameRate.h"
 			>
 		</File>
@@ -2082,6 +2102,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\MandarinAlphMgr.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\MandarinAlphMgr.h"
+			>
+		</File>
+		<File
 			RelativePath=".\ModuleManager.cpp"
 			>
 		</File>
@@ -2098,6 +2126,10 @@
 			>
 		</File>
 		<File
+			RelativePath=".\NodeQueue.h"
+			>
+		</File>
+		<File
 			RelativePath=".\OneButtonDynamicFilter.cpp"
 			>
 		</File>
@@ -2106,6 +2138,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\OneButtonFilter.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\OneButtonFilter.h"
+			>
+		</File>
+		<File
 			RelativePath=".\OneDimensionalFilter.cpp"
 			>
 		</File>
@@ -2182,6 +2222,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\Trainer.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\Trainer.h"
+			>
+		</File>
+		<File
 			RelativePath=".\TrainingHelper.cpp"
 			>
 		</File>
@@ -2198,6 +2246,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\TwoPushDynamicFilter.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\TwoPushDynamicFilter.h"
+			>
+		</File>
+		<File
 			RelativePath="..\Win32\Common\WinUTF8.cpp"
 			>
 		</File>
diff --git a/Src/DasherCore/DasherGameMode.cpp b/Src/DasherCore/DasherGameMode.cpp
index 49ca77d..0c08842 100644
--- a/Src/DasherCore/DasherGameMode.cpp
+++ b/Src/DasherCore/DasherGameMode.cpp
@@ -19,13 +19,16 @@
 using Dasher::GameMode::CDasherGameMode;
 using Dasher::GameMode::UTF8Char;
 
+class Dasher::CEventHandler;
+class CSettingsStore;
+
 std::pair<double,double> GaussianRand();
 
 CDasherGameMode* CDasherGameMode::pTeacher = NULL;
 
-CDasherGameMode* CDasherGameMode::CreateTeacher(CEventHandler *pEventHandler,
+CDasherGameMode* CDasherGameMode::CreateTeacher(Dasher::CEventHandler *pEventHandler,
 						CSettingsStore *pSettingsStore,
-						CDasherInterfaceBase *pDashIface)
+						Dasher::CDasherInterfaceBase *pDashIface)
 {
   delete pTeacher; //Initialised to NULL, so this line is safe.
   pTeacher = new CDasherGameMode(pEventHandler, pSettingsStore, pDashIface);
@@ -38,9 +41,9 @@ void CDasherGameMode::DestroyTeacher()
   pTeacher = NULL;
 }
 
-CDasherGameMode::CDasherGameMode(CEventHandler *pEventHandler,
+CDasherGameMode::CDasherGameMode(Dasher::CEventHandler *pEventHandler,
 				 CSettingsStore *pSettingsStore,
-				 CDasherInterfaceBase *pDashIface)
+				 Dasher::CDasherInterfaceBase *pDashIface)
   :CDasherComponent(pEventHandler, pSettingsStore),
    m_pDasherInterface(pDashIface),
    m_pView(NULL), m_pModel(NULL),
@@ -408,7 +411,7 @@ void CDasherGameMode::NewFrame(unsigned long Time)
 }
 
 
-void CDasherGameMode::SetTargetY(const std::vector<std::pair<myint,bool> >& vTargetY)
+void CDasherGameMode::SetTargetY(const std::vector<std::pair<Dasher::myint,bool> >& vTargetY)
 {
   // Called by the Node Rendering Routine to let us know where the target sentence is
   // vTargetY is a vector of the centerpoints of all drawn targets.
@@ -529,7 +532,7 @@ int CDasherGameMode::LoadTargetStrings(istream& in)
 // In Demo mode, DasherView will use this function to serve up coordinates to the input filter.
 // Make demo mode like as an input device?
 
-void CDasherGameMode::DemoModeGetCoordinates(myint& iDasherX, myint& iDasherY)
+void CDasherGameMode::DemoModeGetCoordinates(Dasher::myint& iDasherX, Dasher::myint& iDasherY)
 {
   static bool bNavError, bFixingNavError=false;
   // First choose an appropriate target...
@@ -595,7 +598,7 @@ void CDasherGameMode::DemoModeGetCoordinates(myint& iDasherX, myint& iDasherY)
 // coordinates to the inputfilters - ie, we can track the mouse from this
 // Mouse coordinates are passed onto the scorer every NewFrame, in case it wants to reward steady
 // hand position, or something similar.
-void CDasherGameMode::SetUserMouseCoordinates(myint iDasherX, myint iDasherY)
+void CDasherGameMode::SetUserMouseCoordinates(Dasher::myint iDasherX, Dasher::myint iDasherY)
 {
   m_iUserX = iDasherX;
   m_iUserY = iDasherY;
@@ -728,7 +731,7 @@ void CDasherGameMode::Oscillator()
 // Drawing Methods for Game/Teacher Mode
 
 // Public function, called by DasherInterfaceBase::Redraw()
-void CDasherGameMode::DrawGameDecorations(CDasherView* pView)
+void CDasherGameMode::DrawGameDecorations(Dasher::CDasherView* pView)
 {
   if(!m_bGameModeOn) return;
 
@@ -748,7 +751,7 @@ void CDasherGameMode::DrawPoints(CDasherView* pView)
 }
 */
 
-void CDasherGameMode::DrawHelperArrow(CDasherView* pView)
+void CDasherGameMode::DrawHelperArrow(Dasher::CDasherView* pView)
 {
  // This plots a helpful pointer to the best direction to take to get to the target.
   // Probably too much floating point maths here, sort later.
@@ -797,7 +800,7 @@ void CDasherGameMode::DrawHelperArrow(CDasherView* pView)
 }
 
 
-void CDasherGameMode::DrawTargetArrow(CDasherView* pView) {
+void CDasherGameMode::DrawTargetArrow(Dasher::CDasherView* pView) {
  // This plots an arrow to show where the target is.
   // Probably too much floating point maths here, sort later.
 
diff --git a/Src/Installer/Dasher.wxs b/Src/Installer/Dasher.wxs
index 6781a7a..733fe07 100644
--- a/Src/Installer/Dasher.wxs
+++ b/Src/Installer/Dasher.wxs
@@ -100,6 +100,7 @@
                 <File Id="alphabet.cherokee.xml" Name="alphabet.cherokee.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.cherokee.xml" />
                 <File Id="alphabet.chinese.xml" Name="alphabet.chinese.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.chinese.xml" />
                 <File Id="alphabet.chineseRuby.xml" Name="alphabet.chineseRuby.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.chineseRuby.xml" />
+                <!-- File Id="alphabet.spyDict.xml" Name="alphabet.spyDict.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.spyDict.xml" /-->
                 <File Id="alphabet.corsican.xml" Name="alphabet.corsican.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.corsican.xml" />
                 <File Id="alphabet.croatian.xml" Name="alphabet.croatian.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.croatian.xml" />
                 <File Id="alphabet.czech.xml" Name="alphabet.czech.xml" DiskId="1" Source="..\..\Data\alphabets\alphabet.czech.xml" />
@@ -171,16 +172,18 @@
               </Component>
               <Component Id="Training" Guid="bcc684a1-0a58-474c-bfd9-c25906bc7bf4">
                 <File Id="training_albanian_SQ.txt" Name="training_albanian_SQ.txt" DiskId="1" Source="..\..\Data\training\training_albanian_SQ.txt" />
-                <File Id="training_basque_EU.txt" Name="training_basque_EU.txt" DiskId="1" Source="..\..\Data\training\training_basque_EU.txt" />
+                <File Id="training_basque_ES.txt" Name="training_basque_ES.txt" DiskId="1" Source="..\..\Data\training\training_basque_ES.txt" />
                 <File Id="training_bengali_BD.txt" Name="training_bengali_BD.txt" DiskId="1" Source="..\..\Data\training\training_bengali_BD.txt" />
                 <!--<File Id="training_bengali_bn.txt" Name="training_bengali_bn.txt" DiskId="1" Source="..\..\Data\training\training_bengali_bn.txt" />-->
                 <File Id="training_canna_JP.txt" Name="training_canna_JP.txt" DiskId="1" Source="..\..\Data\training\training_canna_JP.txt" />
+                <!--File Id="training_spyDict.txt" Name="training_spyDict.txt" DiskId="1" Source="..\..\Data\training\training_spyDict.txt" /-->
                 <File Id="training_czech_CS.txt" Name="training_czech_CS.txt" DiskId="1" Source="..\..\Data\training\training_czech_CS.txt" />
                 <File Id="training_danish_DK.txt" Name="training_danish_DK.txt" DiskId="1" Source="..\..\Data\training\training_danish_DK.txt" />
                 <File Id="training_dutch_NL.txt" Name="training_dutch_NL.txt" DiskId="1" Source="..\..\Data\training\training_dutch_NL.txt" />
                 <File Id="training_english_GB.txt" Name="training_english_GB.txt" DiskId="1" Source="..\..\Data\training\training_english_GB.txt" />
                 <File Id="training_finnish_FI.txt" Name="training_finnish_FI.txt" DiskId="1" Source="..\..\Data\training\training_finnish_FI.txt" />
                 <File Id="training_french_FR.txt" Name="training_french_FR.txt" DiskId="1" Source="..\..\Data\training\training_french_FR.txt" />
+                <File Id="training_frenchC_FR.txt" Name="training_frenchC_FR.txt" DiskId="1" Source="..\..\Data\training\training_frenchC_FR.txt" />
                 <File Id="training_german_DE.txt" Name="training_german_DE.txt" DiskId="1" Source="..\..\Data\training\training_german_DE.txt" />
                 <File Id="training_greek_GR.txt" Name="training_greek_GR.txt" DiskId="1" Source="..\..\Data\training\training_greek_GR.txt" />
                 <File Id="training_hebrew_IL.txt" Name="training_hebrew_IL.txt" DiskId="1" Source="..\..\Data\training\training_hebrew_IL.txt" />
@@ -188,12 +191,15 @@
                 <File Id="training_hiragana83_JP.txt" Name="training_hiragana83_JP.txt" DiskId="1" Source="..\..\Data\training\training_hiragana83_JP.txt" />
                 <File Id="training_hungarian_HU.txt" Name="training_hungarian_HU.txt" DiskId="1" Source="..\..\Data\training\training_hungarian_HU.txt" />
                 <File Id="training_italian_IT.txt" Name="training_italian_IT.txt" DiskId="1" Source="..\..\Data\training\training_italian_IT.txt" />
+                <File Id="training_italianC_IT.txt" Name="training_italianC_IT.txt" DiskId="1" Source="..\..\Data\training\training_italianC_IT.txt" />
                 <File Id="training_mongolian_MN.txt" Name="training_mongolian_MN.txt" DiskId="1" Source="..\..\Data\training\training_mongolian_MN.txt" />
                 <File Id="training_persian_IR.txt" Name="training_persian_IR.txt" DiskId="1" Source="..\..\Data\training\training_persian_IR.txt" />
                 <File Id="training_polish_PL.txt" Name="training_polish_PL.txt" DiskId="1" Source="..\..\Data\training\training_polish_PL.txt" />
                 <File Id="training_portuguese_BR.txt" Name="training_portuguese_BR.txt" DiskId="1" Source="..\..\Data\training\training_portuguese_BR.txt" />
+                <File Id="training_portugueseC_BR.txt" Name="training_portugueseC_BR.txt" DiskId="1" Source="..\..\Data\training\training_portugueseC_BR.txt" />
                 <File Id="training_russian_RU.txt" Name="training_russian_RU.txt" DiskId="1" Source="..\..\Data\training\training_russian_RU.txt" />
                 <File Id="training_spanish_ES.txt" Name="training_spanish_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanish_ES.txt" />
+                <File Id="training_spanishC_ES.txt" Name="training_spanishC_ES.txt" DiskId="1" Source="..\..\Data\training\training_spanishC_ES.txt" />
                 <File Id="training_swahili_KE.txt" Name="training_swahili_KE.txt" DiskId="1" Source="..\..\Data\training\training_swahili_KE.txt" />
                 <File Id="training_swedish_SE.txt" Name="training_swedish_SE.txt" DiskId="1" Source="..\..\Data\training\training_swedish_SE.txt" />
                 <File Id="training_turkish_TR.txt" Name="training_turkish_TR.txt" DiskId="1" Source="..\..\Data\training\training_turkish_TR.txt" />
diff --git a/Src/Win32/Dasher_vc80.sln b/Src/Win32/Dasher_vc80.sln
index 2336d39..388a8d6 100644
--- a/Src/Win32/Dasher_vc80.sln
+++ b/Src/Win32/Dasher_vc80.sln
@@ -176,7 +176,7 @@ Global
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Mixed Platforms.Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Mixed Platforms.Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Win32.ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
+		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Win32.ActiveCfg = Release|Win32
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
 		{752501D3-5B04-4F3C-A141-DE426E354D23}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
diff --git a/Src/Win32/ModuleControl.h b/Src/Win32/ModuleControl.h
index 58e4bba..ea746a0 100644
--- a/Src/Win32/ModuleControl.h
+++ b/Src/Win32/ModuleControl.h
@@ -34,8 +34,8 @@ public:
 
   // Abstract members to be implemented by descendents
   virtual int GetHeightRequest() = 0;
-  virtual void Initialise(CDasherInterfaceBase *pInterface) = 0;
-  virtual void Apply(CDasherInterfaceBase *pInterface) = 0;
+  virtual void Initialise(Dasher::CDasherInterfaceBase *pInterface) = 0;
+  virtual void Apply(Dasher::CDasherInterfaceBase *pInterface) = 0;
   virtual void CreateChild(HWND hParent) = 0;
   virtual void LayoutChild(RECT &sRect) = 0;
 
diff --git a/Src/Win32/ModuleControlBool.cpp b/Src/Win32/ModuleControlBool.cpp
index 3babcfa..c3ab86b 100644
--- a/Src/Win32/ModuleControlBool.cpp
+++ b/Src/Win32/ModuleControlBool.cpp
@@ -4,14 +4,14 @@ int CModuleControlBool::GetHeightRequest() {
   return 10;
 }
 
-void CModuleControlBool::Initialise(CDasherInterfaceBase *pInterface) {
+void CModuleControlBool::Initialise(Dasher::CDasherInterfaceBase *pInterface) {
   if(pInterface->GetBoolParameter(m_iId))
     SendMessage(m_hCheckbox, BM_SETCHECK, BST_CHECKED, 0);
   else
     SendMessage(m_hCheckbox, BM_SETCHECK, BST_UNCHECKED, 0);
 }
 
-void CModuleControlBool::Apply(CDasherInterfaceBase *pInterface) {
+void CModuleControlBool::Apply(Dasher::CDasherInterfaceBase *pInterface) {
   pInterface->SetBoolParameter(m_iId, SendMessage(m_hCheckbox, BM_GETCHECK, 0, 0) == BST_CHECKED);
 }
 
diff --git a/Src/Win32/ModuleControlBool.h b/Src/Win32/ModuleControlBool.h
index c6bef05..eccbe73 100644
--- a/Src/Win32/ModuleControlBool.h
+++ b/Src/Win32/ModuleControlBool.h
@@ -8,8 +8,8 @@ public:
   CModuleControlBool(SModuleSettings *pSetting) : CModuleControl(pSetting) {};
 
   virtual int GetHeightRequest();
-  virtual void Initialise(CDasherInterfaceBase *pInterface);
-  virtual void Apply(CDasherInterfaceBase *pInterface);
+  virtual void Initialise(Dasher::CDasherInterfaceBase *pInterface);
+  virtual void Apply(Dasher::CDasherInterfaceBase *pInterface);
   virtual void CreateChild(HWND hParent);
   virtual void LayoutChild(RECT &sRect);
 
diff --git a/Src/Win32/ModuleControlLong.cpp b/Src/Win32/ModuleControlLong.cpp
index 2f9492d..f653b58 100644
--- a/Src/Win32/ModuleControlLong.cpp
+++ b/Src/Win32/ModuleControlLong.cpp
@@ -17,7 +17,7 @@ int CModuleControlLong::GetHeightRequest() {
   return 12;
 }
 
-void CModuleControlLong::Initialise(CDasherInterfaceBase *pInterface) {
+void CModuleControlLong::Initialise(Dasher::CDasherInterfaceBase *pInterface) {
   int iValue(pInterface->GetLongParameter(m_iId));
   SendMessage(m_hSlider, TBM_SETPOS, (WPARAM)false, (LPARAM)iValue);
 
@@ -26,7 +26,7 @@ void CModuleControlLong::Initialise(CDasherInterfaceBase *pInterface) {
   SendMessage(m_hEntry, WM_SETTEXT, 0, (LPARAM) tcBuffer);
 }
 
-void CModuleControlLong::Apply(CDasherInterfaceBase *pInterface) {
+void CModuleControlLong::Apply(Dasher::CDasherInterfaceBase *pInterface) {
   int iValue = SendMessage(m_hSlider, TBM_GETPOS, 0, 0);
   pInterface->SetLongParameter(m_iId, iValue);
 }
diff --git a/Src/Win32/ModuleControlLong.h b/Src/Win32/ModuleControlLong.h
index 29afecc..b3d15ca 100644
--- a/Src/Win32/ModuleControlLong.h
+++ b/Src/Win32/ModuleControlLong.h
@@ -10,8 +10,8 @@ public:
   virtual LRESULT OnScroll(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
  
   virtual int GetHeightRequest();
-  virtual void Initialise(CDasherInterfaceBase *pInterface);
-  virtual void Apply(CDasherInterfaceBase *pInterface);
+  virtual void Initialise(Dasher::CDasherInterfaceBase *pInterface);
+  virtual void Apply(Dasher::CDasherInterfaceBase *pInterface);
   virtual void CreateChild(HWND hParent);
   virtual void LayoutChild(RECT &sRect);
 
diff --git a/Src/Win32/ModuleControlLongSpin.cpp b/Src/Win32/ModuleControlLongSpin.cpp
index 6c9960b..4d39fb7 100644
--- a/Src/Win32/ModuleControlLongSpin.cpp
+++ b/Src/Win32/ModuleControlLongSpin.cpp
@@ -4,13 +4,13 @@ int CModuleControlLongSpin::GetHeightRequest() {
   return 12;
 }
 
-void CModuleControlLongSpin::Initialise(CDasherInterfaceBase *pInterface) {
+void CModuleControlLongSpin::Initialise(Dasher::CDasherInterfaceBase *pInterface) {
   int iValue(pInterface->GetLongParameter(m_iId));
   SendMessage(m_hSpin, UDM_SETPOS, 0, (LPARAM) MAKELONG ((short)iValue, 0));
   UpdateEntry(iValue, 0);
 }
 
-void CModuleControlLongSpin::Apply(CDasherInterfaceBase *pInterface) {
+void CModuleControlLongSpin::Apply(Dasher::CDasherInterfaceBase *pInterface) {
   int iValue(SendMessage(m_hSpin, UDM_GETPOS, 0, 0));
   pInterface->SetLongParameter(m_iId, iValue);
 }
diff --git a/Src/Win32/ModuleControlLongSpin.h b/Src/Win32/ModuleControlLongSpin.h
index ad4b904..71a4f92 100644
--- a/Src/Win32/ModuleControlLongSpin.h
+++ b/Src/Win32/ModuleControlLongSpin.h
@@ -10,8 +10,8 @@ public:
   virtual LRESULT OnNotify(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
   virtual int GetHeightRequest();
-  virtual void Initialise(CDasherInterfaceBase *pInterface);
-  virtual void Apply(CDasherInterfaceBase *pInterface);
+  virtual void Initialise(Dasher::CDasherInterfaceBase *pInterface);
+  virtual void Apply(Dasher::CDasherInterfaceBase *pInterface);
   virtual void CreateChild(HWND hParent);
   virtual void LayoutChild(RECT &sRect);
 
diff --git a/Src/Win32/ModuleControlString.cpp b/Src/Win32/ModuleControlString.cpp
index c3b7875..a9676da 100644
--- a/Src/Win32/ModuleControlString.cpp
+++ b/Src/Win32/ModuleControlString.cpp
@@ -4,13 +4,13 @@ int CModuleControlString::GetHeightRequest() {
   return 14;
 }
 
-void CModuleControlString::Initialise(CDasherInterfaceBase *pInterface) {
+void CModuleControlString::Initialise(Dasher::CDasherInterfaceBase *pInterface) {
   std::wstring strText;
   WinUTF8::UTF8string_to_wstring(pInterface->GetStringParameter(m_iId), strText);
   SendMessage(m_hEntry, WM_SETTEXT, 0, (LPARAM)strText.c_str());
 }
 
-void CModuleControlString::Apply(CDasherInterfaceBase *pInterface) {
+void CModuleControlString::Apply(Dasher::CDasherInterfaceBase *pInterface) {
   TCHAR tcBuffer[256];
   SendMessage(m_hEntry, WM_GETTEXT, 100, (LPARAM)tcBuffer);
   
diff --git a/Src/Win32/ModuleControlString.h b/Src/Win32/ModuleControlString.h
index d30bb3f..694ae85 100644
--- a/Src/Win32/ModuleControlString.h
+++ b/Src/Win32/ModuleControlString.h
@@ -8,8 +8,8 @@ public:
   CModuleControlString(SModuleSettings *pSetting) : CModuleControl(pSetting) {};
 
   virtual int GetHeightRequest();
-  virtual void Initialise(CDasherInterfaceBase *pInterface);
-  virtual void Apply(CDasherInterfaceBase *pInterface);
+  virtual void Initialise(Dasher::CDasherInterfaceBase *pInterface);
+  virtual void Apply(Dasher::CDasherInterfaceBase *pInterface);
   virtual void CreateChild(HWND hParent);
   virtual void LayoutChild(RECT &sRect);
 
diff --git a/Src/Win32/ModuleSettings.cpp b/Src/Win32/ModuleSettings.cpp
index dcdb928..869fff1 100644
--- a/Src/Win32/ModuleSettings.cpp
+++ b/Src/Win32/ModuleSettings.cpp
@@ -6,7 +6,7 @@
 
 CONST UINT WM_MS_CLOSE = RegisterWindowMessage(_WM_MS_CLOSE);
 
-CModuleSettings::CModuleSettings(const std::string &strModuleName, SModuleSettings *pSettings, int iCount, CDasherInterfaceBase *pInterface) {
+CModuleSettings::CModuleSettings(const std::string &strModuleName, SModuleSettings *pSettings, int iCount, Dasher::CDasherInterfaceBase *pInterface) {
   m_iCount = iCount;
   m_pControls = new CModuleControl*[m_iCount];
   m_pInterface = pInterface;
diff --git a/Src/Win32/ModuleSettings.h b/Src/Win32/ModuleSettings.h
index 1ff8fac..497f09a 100644
--- a/Src/Win32/ModuleSettings.h
+++ b/Src/Win32/ModuleSettings.h
@@ -13,7 +13,7 @@ extern CONST UINT WM_MS_CLOSE;
 
 class CModuleSettings : public CWindowImpl<CModuleSettings> {
 public:
-  CModuleSettings(const std::string &strModuleName, SModuleSettings *pSettings, int iCount, CDasherInterfaceBase *pInterface);
+  CModuleSettings(const std::string &strModuleName, SModuleSettings *pSettings, int iCount, Dasher::CDasherInterfaceBase *pInterface);
   ~CModuleSettings();
 
   void Create(HWND hWndParent, ATL::_U_RECT rect);
@@ -44,7 +44,7 @@ private:
   HWND m_hOk;
   HWND m_hCancel;
 
-  CDasherInterfaceBase *m_pInterface;
+  Dasher::CDasherInterfaceBase *m_pInterface;
 };
 
 //#endif
\ No newline at end of file
diff --git a/Src/Win32/TabletPC/InkCollectorEvents.h b/Src/Win32/TabletPC/InkCollectorEvents.h
index e527202..3437351 100644
--- a/Src/Win32/TabletPC/InkCollectorEvents.h
+++ b/Src/Win32/TabletPC/InkCollectorEvents.h
@@ -10,7 +10,7 @@
 #define __TabletPC_InkCollectorEvents_h__
 
 #include <cassert>
-#define interface struct
+// XXX what is this for? #define interface struct
 #include <msinkaut.h>
 
 /////////////////////////////////////////////////////////
diff --git a/Src/Win32/Widgets/AdvancedPage.h b/Src/Win32/Widgets/AdvancedPage.h
index a35c4b4..ae9da1f 100644
--- a/Src/Win32/Widgets/AdvancedPage.h
+++ b/Src/Win32/Widgets/AdvancedPage.h
@@ -19,7 +19,7 @@
 
 class CAdvancedPage:public CPrefsPageBase {
 public:
-  CAdvancedPage(HWND Parent, CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
+  CAdvancedPage(HWND Parent, Dasher::CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
   
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 
diff --git a/Src/Win32/Widgets/AlphabetBox.h b/Src/Win32/Widgets/AlphabetBox.h
index aadcbc6..9eb33f5 100644
--- a/Src/Win32/Widgets/AlphabetBox.h
+++ b/Src/Win32/Widgets/AlphabetBox.h
@@ -15,11 +15,11 @@
 
 class CAlphabetBox : public CPrefsPageBase {
 public:
-  CAlphabetBox(HWND Parent, CDasherInterfaceBase *DI, CAppSettings *pAppSettings);
+	CAlphabetBox(HWND Parent, Dasher::CDasherInterfaceBase *DI, CAppSettings *pAppSettings);
 protected:
-  LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
+	LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 private:
-  CDasherInterfaceBase * m_pDasherInterface;
+  Dasher::CDasherInterfaceBase * m_pDasherInterface;
   HWND m_hPropertySheet;
 
   HWND CustomBox;
diff --git a/Src/Win32/Widgets/Canvas.cpp b/Src/Win32/Widgets/Canvas.cpp
index ff5735a..4747e78 100644
--- a/Src/Win32/Widgets/Canvas.cpp
+++ b/Src/Win32/Widgets/Canvas.cpp
@@ -19,7 +19,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 1 needed for WM_THEMECHANGED
-#define _WIN32_WINNT 0x0501
+// XXX Why lie? #define _WIN32_WINNT 0x0501
 
 
 #include "..\Common\WinCommon.h"
diff --git a/Src/Win32/Widgets/Canvas.h b/Src/Win32/Widgets/Canvas.h
index 5beff38..b6ce879 100644
--- a/Src/Win32/Widgets/Canvas.h
+++ b/Src/Win32/Widgets/Canvas.h
@@ -21,7 +21,7 @@
 #ifndef __Canvas_h__
 #define __Canvas_h__
 
-#define _WIN32_WINNT 0x0501
+// XXX why lie? #define _WIN32_WINNT 0x0501
 
 
 #include <windows.h>
diff --git a/Src/Win32/Widgets/ColourBox.h b/Src/Win32/Widgets/ColourBox.h
index 7011a9f..f79554f 100644
--- a/Src/Win32/Widgets/ColourBox.h
+++ b/Src/Win32/Widgets/ColourBox.h
@@ -17,11 +17,11 @@
 
 class CColourBox:public CWinWrap {
 public:
-  CColourBox(HWND Parent, CDasherInterfaceBase * DI);
+  CColourBox(HWND Parent, Dasher::CDasherInterfaceBase * DI);
 protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 private:
-  CDasherInterfaceBase * m_pDasherInterface;
+  Dasher::CDasherInterfaceBase * m_pDasherInterface;
   HWND CustomBox;
 
   std::vector < std::string > ColourList;
diff --git a/Src/Win32/Widgets/ControlPage.h b/Src/Win32/Widgets/ControlPage.h
index 65fc7b9..d656555 100644
--- a/Src/Win32/Widgets/ControlPage.h
+++ b/Src/Win32/Widgets/ControlPage.h
@@ -21,7 +21,7 @@ class CAppSettings;
 
 class CControlPage:public CPrefsPageBase {
 public:
-  CControlPage(HWND Parent, CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
+  CControlPage(HWND Parent, Dasher::CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
 protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 private:
diff --git a/Src/Win32/Widgets/GameGroup.cpp b/Src/Win32/Widgets/GameGroup.cpp
index 1648e0b..bddb0e3 100644
--- a/Src/Win32/Widgets/GameGroup.cpp
+++ b/Src/Win32/Widgets/GameGroup.cpp
@@ -6,11 +6,11 @@
 #include <string>
 #include <sstream>
 
-// TODO: Make this a notify?
+// TODO: Make this a notify
 //using namespace Dasher::GameMode;
 
 
-CGameGroup::CGameGroup(CDasherInterfaceBase *pDasherInterface, CEdit* pEdit) {
+CGameGroup::CGameGroup(Dasher::CDasherInterfaceBase *pDasherInterface, CEdit* pEdit) {
   m_pDasherInterface = pDasherInterface;
   m_pEdit = pEdit;
   m_pDemoButton=NULL;
@@ -215,14 +215,14 @@ LRESULT CGameGroup::OnShow(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHa
 LRESULT CGameGroup::OnDemoClick(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {  
   int message = (m_pDemoButton->SendMessage(BM_GETCHECK)==BST_CHECKED)?
-    (GameMode::GAME_MESSAGE_DEMO_ON):(GameMode::GAME_MESSAGE_DEMO_OFF);
+	  (Dasher::GameMode::GAME_MESSAGE_DEMO_ON):(Dasher::GameMode::GAME_MESSAGE_DEMO_OFF);
   m_pDasherInterface->GameMessageIn(message, NULL);
   return 0;
 }
 
 LRESULT CGameGroup::OnNextClick(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
 {  
-  m_pDasherInterface->GameMessageIn(GameMode::GAME_MESSAGE_NEXT, NULL);
+	m_pDasherInterface->GameMessageIn(Dasher::GameMode::GAME_MESSAGE_NEXT, NULL);
   return 0;
 }
 
diff --git a/Src/Win32/Widgets/LMPage.h b/Src/Win32/Widgets/LMPage.h
index b7bdb9b..2a0ab4f 100644
--- a/Src/Win32/Widgets/LMPage.h
+++ b/Src/Win32/Widgets/LMPage.h
@@ -19,7 +19,7 @@
 
 class CLMPage:public CPrefsPageBase {
 public:
-  CLMPage(HWND Parent, CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
+  CLMPage(HWND Parent, Dasher::CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
 protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 private:
diff --git a/Src/Win32/Widgets/PrefsPageBase.h b/Src/Win32/Widgets/PrefsPageBase.h
index e6a2945..d5431f6 100755
--- a/Src/Win32/Widgets/PrefsPageBase.h
+++ b/Src/Win32/Widgets/PrefsPageBase.h
@@ -20,7 +20,7 @@
 
 class CPrefsPageBase:public CWinWrap {
 public:
-  CPrefsPageBase(HWND Parent, CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
+	CPrefsPageBase(HWND Parent, Dasher::CDasherInterfaceBase * DI, CAppSettings *pAppSettings);
 
 protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
@@ -33,7 +33,7 @@ protected:
   // what's up in order to prevent page turning.
   virtual bool Validate();
   
-  CDasherInterfaceBase * m_pDasherInterface;
+  Dasher::CDasherInterfaceBase * m_pDasherInterface;
   CAppSettings *m_pAppSettings;
   HWND m_hPropertySheet; // the property sheet of which we are one page
 };
diff --git a/Src/Win32/Widgets/Slidebar.h b/Src/Win32/Widgets/Slidebar.h
index 03a3595..199eeeb 100644
--- a/Src/Win32/Widgets/Slidebar.h
+++ b/Src/Win32/Widgets/Slidebar.h
@@ -21,7 +21,7 @@
 
 class CSlidebar {
 public:
-  CSlidebar(HWND ParentWindow, CDasherInterfaceBase * DasherInterface);
+	CSlidebar(HWND ParentWindow, Dasher::CDasherInterfaceBase * DasherInterface);
 
   // Called when the parent window gets resized, makes the rebar position itself correctly
   void Resize();
diff --git a/Src/Win32/Widgets/StatusControl.cpp b/Src/Win32/Widgets/StatusControl.cpp
index 837a1ad..4a89d2b 100644
--- a/Src/Win32/Widgets/StatusControl.cpp
+++ b/Src/Win32/Widgets/StatusControl.cpp
@@ -6,7 +6,7 @@
 // TODO: Make this a notify?
 CONST UINT DASHER_SHOW_PREFS = RegisterWindowMessage(_DASHER_SHOW_PREFS);
 
-CStatusControl::CStatusControl(CDasherInterfaceBase *pDasherInterface) {
+CStatusControl::CStatusControl(Dasher::CDasherInterfaceBase *pDasherInterface) {
   m_pDasherInterface = pDasherInterface;
 }
 
diff --git a/Src/Win32/Widgets/StatusControl.h b/Src/Win32/Widgets/StatusControl.h
index 7b0727c..f4a2f57 100644
--- a/Src/Win32/Widgets/StatusControl.h
+++ b/Src/Win32/Widgets/StatusControl.h
@@ -12,7 +12,7 @@ extern CONST UINT DASHER_SHOW_PREFS;
 
 class CStatusControl : public ATL::CWindowImpl<CStatusControl> {
 public:
-  CStatusControl(CDasherInterfaceBase *pDasherInterface);
+	CStatusControl(Dasher::CDasherInterfaceBase *pDasherInterface);
 
   // ATL boilerplate code
   DECLARE_WND_SUPERCLASS(L"STATUSCONTROL", L"STATIC");
@@ -58,7 +58,7 @@ private:
   void UpdateSpeed(int iPos, int iDelta);
 
   // The Dasher interface with which this control communicates
-  CDasherInterfaceBase *m_pDasherInterface;
+  Dasher::CDasherInterfaceBase *m_pDasherInterface;
 
   // Handles to child windows
   HWND m_hEdit;
diff --git a/Src/Win32/Widgets/Toolbar.h b/Src/Win32/Widgets/Toolbar.h
index bd5e714..a012178 100644
--- a/Src/Win32/Widgets/Toolbar.h
+++ b/Src/Win32/Widgets/Toolbar.h
@@ -33,7 +33,7 @@ private:
   // Destroy the toolbar window (used when it's not visible - shouldn't we just hide it?)
   void DestroyToolbar();
 
-  CDasherInterfaceBase *m_pDasher;
+  Dasher::CDasherInterfaceBase *m_pDasher;
   HWND m_hwnd;
   HWND m_hParent;
   HWND m_hRebar;
diff --git a/Src/Win32/Widgets/ViewPage.cpp b/Src/Win32/Widgets/ViewPage.cpp
index a2ce06f..408d09a 100644
--- a/Src/Win32/Widgets/ViewPage.cpp
+++ b/Src/Win32/Widgets/ViewPage.cpp
@@ -26,7 +26,7 @@ static char THIS_FILE[] = __FILE__;
 #endif
 #endif
 
-CViewPage::CViewPage(HWND Parent, CDasherInterfaceBase *DI, CAppSettings *pAppSettings)
+CViewPage::CViewPage(HWND Parent, Dasher::CDasherInterfaceBase *DI, CAppSettings *pAppSettings)
 :CPrefsPageBase(Parent, DI, pAppSettings) {
 
   m_CurrentColours = DI->GetStringParameter(SP_COLOUR_ID);
diff --git a/Src/Win32/Widgets/ViewPage.h b/Src/Win32/Widgets/ViewPage.h
index 3716d62..3f0a85c 100644
--- a/Src/Win32/Widgets/ViewPage.h
+++ b/Src/Win32/Widgets/ViewPage.h
@@ -19,7 +19,7 @@
 
 class CViewPage:public CPrefsPageBase {
 public:
-  CViewPage(HWND Parent, CDasherInterfaceBase *DI, CAppSettings *pAppSettings);
+	CViewPage(HWND Parent, Dasher::CDasherInterfaceBase *DI, CAppSettings *pAppSettings);
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 
 private:
@@ -33,7 +33,7 @@ private:
   void PopulateList();
   void InitCustomBox();
   bool UpdateInfo();
- bool Apply();
+  bool Apply();
 
 };
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]