[dasher: 133/217] Cleanup. Got rid of win95 and unused members.

[Patrick Welche <pwelche src gnome org>]

commit a27570b10cee99163176b70b3fe8587cda022fbc
Author: ipomoena <amajorek google com>
Date:   Thu Dec 3 15:56:42 2015 -0800

    Cleanup. Got rid of win95 and unused members.

 Src/Win32/Common/WinCommon.h    |   41 ---------------------------------------
 Src/Win32/Common/WinHelper.cpp  |   20 +------------------
 Src/Win32/Widgets/ControlPage.h |    4 ---
 Src/Win32/Widgets/Prefs.h       |    2 -
 4 files changed, 1 insertions(+), 66 deletions(-)
---
diff --git a/Src/Win32/Common/WinCommon.h b/Src/Win32/Common/WinCommon.h
index fd9e34d..ad30312 100644
--- a/Src/Win32/Common/WinCommon.h
+++ b/Src/Win32/Common/WinCommon.h
@@ -29,51 +29,10 @@
 #include <Commdlg.h>
 #include <limits>
 
-// Use common controls
-/*
-  ACL: Used to have separate header file WinHelper.h in addition to this, which
-  wrapped the #include  of commctrl.h with the following "#ifdef OriginalWin95"
-  sections. I'm including them here in case they are needed, along with comment:
-
-  Initialise Common Controls library. If we want this to work with Windows 95
-  with no extra dll's or versions of IE installed, we define OriginalWin95 and
-  play games with macros. Having said that, almost all Windows systems should
-  have the required DLL for new common control features (either with the system
-  or with IE). If not it is an easy upgrade from:
-    http://www.microsoft.com/msdownload/ieplatform/ie/comctrlx86.asp
-
-  IAM 08/2002
-*/
-#ifdef OriginalWin95
-#define _WIN32_IE_TMP _WIN32_IE
-#undef _WIN32_IE
-#define _WIN32_IE 0x0100
-#endif
-
 #include <commctrl.h>
-//ACL and also the following...
-#ifdef OriginalWin95
-#undef _WIN32_IE
-#define _WIN32_IE _WIN32_IE_TMP
-#undef _WIN32_IE_TMP
-#endif
-
-#ifdef OriginalWin95
-#undef CP_UTF8                  // as we can't use it
-#endif
-//ACL end moved from WinHelper.h
 
 #include "../../Common/Common.h"
 
-// windows.h provides the "generic" character type TCHAR.
-//ACL apparently TCHAR is "wchar_t" (=16bit) if unicode is enabled, else "char".
-//We seem to use it interchangeably with wchar, so presumably will only compile
-// with unicode!
-
-//There is no "tchar.h", so commenting out:
-// #include "tchar.h"              // this adds some useful macros
-//...there _is_ a <tchar.h>, but if we don't need it...?
-
 // Sometimes it is much easier to use strings, for which we have Tstring.
 #include <string>
 //ACL given unicode, this defines Tstring as equivalent to std::wstring...
diff --git a/Src/Win32/Common/WinHelper.cpp b/Src/Win32/Common/WinHelper.cpp
index 62b4f80..4eb3cdd 100644
--- a/Src/Win32/Common/WinHelper.cpp
+++ b/Src/Win32/Common/WinHelper.cpp
@@ -36,35 +36,20 @@ void WinHelper::InitCommonControlLib() {
   if(CommonControlsInited)
     return;
 
-#ifdef OriginalWin95
-  InitCommonControls();
-#else
   INITCOMMONCONTROLSEX iccex;
   iccex.dwSize = sizeof(INITCOMMONCONTROLSEX);
   iccex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES;
   InitCommonControlsEx(&iccex);
-#endif
-
   CommonControlsInited = true;
 }
 
-#ifndef OriginalWin95
 namespace {
-// For SHGetSpecialFolderPath. Needs IE 4.0 or above (Win98+ always ok).
+// For SHGetSpecialFolderPath.
 #include "shlobj.h"
 }
-#endif
 
 void WinHelper::GetUserDirectory(Tstring *Output) {
   Tstring & UserData = *Output;
-
-#ifdef         OriginalWin95
-  // Not a lot else I can do :(
-  GetAppDirectory(Output);
-#elif  defined _WIN32_WCE
-  GetAppDirectory(Output);
-#else
-
   TCHAR Buffer[MAX_PATH];
   // My documentation says SHGetSpecialFolderPath returns NOERROR if successful
   // With my headers NOERROR==0 and this function returns TRUE==1 as docs online say.
@@ -75,9 +60,6 @@ void WinHelper::GetUserDirectory(Tstring *Output) {
   UserData = Buffer;
   if(UserData[UserData.size() - 1] != TEXT('\\'))
     UserData += TEXT('\\');
-
-#endif
-
 }
 
 void WinHelper::GetAppDirectory(Tstring *Output) {
diff --git a/Src/Win32/Widgets/ControlPage.h b/Src/Win32/Widgets/ControlPage.h
index 450dac8..82c0953 100644
--- a/Src/Win32/Widgets/ControlPage.h
+++ b/Src/Win32/Widgets/ControlPage.h
@@ -13,7 +13,6 @@
 
 
 #include "../../DasherCore/DasherInterfaceBase.h"
-#include "../../DasherCore/ColourIO.h"
 
 class CAppSettings;
 
@@ -25,9 +24,6 @@ protected:
 private:
   Dasher::CDasherInterfaceBase *m_pDasherInterface;
 
-  std::vector < std::string > ColourList;
-  std::string m_CurrentColours;
-  Dasher::CColourIO::ColourInfo CurrentInfo;
   TCHAR m_tcBuffer[1000];
   
   // Handles to important widgets
diff --git a/Src/Win32/Widgets/Prefs.h b/Src/Win32/Widgets/Prefs.h
index b6cdc90..6401381 100644
--- a/Src/Win32/Widgets/Prefs.h
+++ b/Src/Win32/Widgets/Prefs.h
@@ -32,8 +32,6 @@ protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 
 private:
-  HWND m_hCustomBox;
- 
   CAlphabetBox *m_pAlphabetBox;
   CControlPage *m_pControlPage;
   CViewPage *m_pViewPage;