[dasher: 50/217] Removed lots of unused win32 code



commit 0552ec40a4e801272038f4860a847ea027269c53
Author: ipomoena <amajorek google com>
Date:   Sat Oct 3 20:58:27 2015 -0700

    Removed lots of unused win32 code

 Src/Win32/ButtonPrefs.cpp          |  228 ------------------------------------
 Src/Win32/ButtonPrefs.h            |   54 ---------
 Src/Win32/DasherWindow.h           |    4 +-
 Src/Win32/Widgets/AdvancedPage.h   |    1 -
 Src/Win32/Widgets/AlphabetBox.cpp  |    2 +-
 Src/Win32/Widgets/AlphabetBox.h    |    2 -
 Src/Win32/Widgets/ColourBox.cpp    |  146 -----------------------
 Src/Win32/Widgets/ColourBox.h      |   39 ------
 Src/Win32/Widgets/ControlPage.cpp  |    2 -
 Src/Win32/Widgets/ControlPage.h    |    2 -
 Src/Win32/Widgets/KeyControl.cpp   |  184 -----------------------------
 Src/Win32/Widgets/KeyControl.h     |   46 -------
 Src/Win32/Widgets/Prefs.h          |    2 -
 Src/Win32/Widgets/SocketPage.cpp   |  152 ------------------------
 Src/Win32/Widgets/SocketPage.h     |   37 ------
 Src/Win32/Widgets/SplashScreen.cpp |   89 --------------
 Src/Win32/Widgets/SplashScreen.h   |   23 ----
 Src/Win32/Widgets/ViewPage.h       |    2 -
 Src/Win32/Widgets/WindowSelect.cpp |  135 ---------------------
 Src/Win32/Widgets/WindowSelect.h   |   43 -------
 20 files changed, 2 insertions(+), 1191 deletions(-)
---
diff --git a/Src/Win32/DasherWindow.h b/Src/Win32/DasherWindow.h
index 91abc8d..3a652de 100644
--- a/Src/Win32/DasherWindow.h
+++ b/Src/Win32/DasherWindow.h
@@ -11,8 +11,7 @@
 
 #include "Widgets/Splitter.h"
 #include "Widgets/StatusControl.h"
-#include "Widgets/SplashScreen.h"
-#include "Widgets/WindowSelect.h"
+#include "Widgets/Edit.h"
 #include "DasherMouseInput.h"
 #include "AppSettings.h"
 
@@ -90,7 +89,6 @@ private:
        //CCanvas *m_pCanvas;
        CSplitter *m_pSplitter;
        CStatusControl *m_pSpeedAlphabetBar;
-       //CSplash *Splash;
 
        CAppSettings *m_pAppSettings;
 
diff --git a/Src/Win32/Widgets/AdvancedPage.h b/Src/Win32/Widgets/AdvancedPage.h
index 29a8f83..c4bc170 100644
--- a/Src/Win32/Widgets/AdvancedPage.h
+++ b/Src/Win32/Widgets/AdvancedPage.h
@@ -22,7 +22,6 @@ public:
 
 protected:
 private:
-  HWND CustomBox;
 
   std::string GetControlText(HWND Dialog, int ControlID);
 
diff --git a/Src/Win32/Widgets/AlphabetBox.cpp b/Src/Win32/Widgets/AlphabetBox.cpp
index c293b2e..d439291 100644
--- a/Src/Win32/Widgets/AlphabetBox.cpp
+++ b/Src/Win32/Widgets/AlphabetBox.cpp
@@ -37,7 +37,7 @@ static menuentry menutable[] = {
 };
 
 CAlphabetBox::CAlphabetBox(HWND Parent, CAppSettings *pAppSettings)
-: CPrefsPageBase(Parent, pAppSettings), m_CurrentAlphabet(pAppSettings->GetStringParameter(SP_ALPHABET_ID)), 
 Editing(false), Cloning(false), EditChar(false), CustomBox(0), CurrentGroup(0), CurrentChar(0) {
+: CPrefsPageBase(Parent, pAppSettings), m_CurrentAlphabet(pAppSettings->GetStringParameter(SP_ALPHABET_ID)), 
 Editing(false), Cloning(false), EditChar(false), CurrentGroup(0), CurrentChar(0) {
   m_hwnd = 0;
   m_hPropertySheet = 0;
 }
diff --git a/Src/Win32/Widgets/AlphabetBox.h b/Src/Win32/Widgets/AlphabetBox.h
index 7fe719f..529f1aa 100644
--- a/Src/Win32/Widgets/AlphabetBox.h
+++ b/Src/Win32/Widgets/AlphabetBox.h
@@ -20,8 +20,6 @@ protected:
 private:
   HWND m_hPropertySheet;
 
-  HWND CustomBox;
-
   std::vector < std::string > AlphabetList;
   std::string m_CurrentAlphabet;
   //Dasher::CAlphInfo CurrentInfo;//for editing alphabets
diff --git a/Src/Win32/Widgets/ControlPage.cpp b/Src/Win32/Widgets/ControlPage.cpp
index 4eed542..7ed3157 100644
--- a/Src/Win32/Widgets/ControlPage.cpp
+++ b/Src/Win32/Widgets/ControlPage.cpp
@@ -12,7 +12,6 @@
 #include "../resource.h"
 #include "../Common/StringUtils.h"
 #include "../AppSettings.h"
-#include "../ButtonPrefs.h"
 #include "../ModuleSettings.h"
 
 
@@ -119,7 +118,6 @@ void CControlPage::PopulateList() {
 
 // TODO: Pretty horrible - sort this out
   {
-        //CButtonPrefs ButtonPrefs(m_hwnd, 0, m_pAppSettings);
         int iSelection(SendMessage(GetDlgItem(m_hwnd, IDC_CONTROL_LIST), LB_GETCURSEL, 0, 0));
     
         int iLength(SendMessage(GetDlgItem(m_hwnd, IDC_CONTROL_LIST), LB_GETTEXTLEN, iSelection, 0));
diff --git a/Src/Win32/Widgets/ControlPage.h b/Src/Win32/Widgets/ControlPage.h
index dc27a38..450dac8 100644
--- a/Src/Win32/Widgets/ControlPage.h
+++ b/Src/Win32/Widgets/ControlPage.h
@@ -23,8 +23,6 @@ public:
 protected:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 private:
-  HWND CustomBox;
-  
   Dasher::CDasherInterfaceBase *m_pDasherInterface;
 
   std::vector < std::string > ColourList;
diff --git a/Src/Win32/Widgets/Prefs.h b/Src/Win32/Widgets/Prefs.h
index d5e5552..b6cdc90 100644
--- a/Src/Win32/Widgets/Prefs.h
+++ b/Src/Win32/Widgets/Prefs.h
@@ -14,7 +14,6 @@
 
 
 #include "AlphabetBox.h"
-#include "ColourBox.h"
 #include "ControlPage.h"
 #include "ViewPage.h"
 #include "AdvancedPage.h"
@@ -36,7 +35,6 @@ private:
   HWND m_hCustomBox;
  
   CAlphabetBox *m_pAlphabetBox;
-  CColourBox *m_pColourBox;
   CControlPage *m_pControlPage;
   CViewPage *m_pViewPage;
   CAdvancedPage *m_pAdvancedPage;
diff --git a/Src/Win32/Widgets/ViewPage.h b/Src/Win32/Widgets/ViewPage.h
index e6c1ad9..ec64554 100644
--- a/Src/Win32/Widgets/ViewPage.h
+++ b/Src/Win32/Widgets/ViewPage.h
@@ -23,8 +23,6 @@ public:
   LRESULT WndProc(HWND Window, UINT message, WPARAM wParam, LPARAM lParam);
 
 private:
-  HWND CustomBox;
-
   std::vector < std::string > ColourList;
   std::string m_CurrentColours;
   Dasher::CColourIO::ColourInfo CurrentInfo;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]