[dasher: 24/217] Cleanups

[Patrick Welche <pwelche src gnome org>]

commit 60b53c28406219c75884efe1e01fa27273e3ce48
Author: ipomoena <amajorek google com>
Date:   Thu Sep 10 17:06:22 2015 -0700

    Cleanups

 Src/Win32/Common/DasherEncodingToCP.cpp |   97 -------------------------------
 Src/Win32/Common/DasherEncodingToCP.h   |   16 -----
 Src/Win32/DasherWindow.cpp              |    3 +-
 Src/Win32/DasherWindow.h                |    2 -
 Src/Win32/Dasher_vc2013.vcxproj         |    4 -
 Src/Win32/Widgets/Edit.cpp              |    2 -
 Src/Win32/Widgets/Menu.cpp              |   63 --------------------
 Src/Win32/Widgets/Menu.h                |   29 ---------
 Src/Win32/Widgets/Screen.cpp            |    2 -
 9 files changed, 2 insertions(+), 216 deletions(-)
---
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index b48f3ac..9984797 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -316,7 +316,7 @@ LRESULT CDasherWindow::OnGetMinMaxInfo(UINT message, WPARAM wParam, LPARAM lPara
 }
 
 LRESULT CDasherWindow::OnInitMenuPopup(UINT message, WPARAM wParam, LPARAM lParam, BOOL& bHandled) {
-  WinMenu.SortOut((HMENU)wParam);
+  EnableMenuItem((HMENU)wParam, ID_EDIT_PASTE, IsClipboardFormatAvailable(CF_TEXT)?MF_ENABLED: MF_GRAYED);
   return 0;
 }
 
@@ -389,6 +389,7 @@ void CDasherWindow::Layout() {
 
   int SpeedAlphabetHeight = m_pAppSettings->GetBoolParameter(BP_SHOW_SLIDER) ? 
m_pSpeedAlphabetBar->GetHeight() : 0;
   m_pSpeedAlphabetBar->MoveWindow(0, Height - SpeedAlphabetHeight, Width, SpeedAlphabetHeight);
+  m_pSpeedAlphabetBar->ShowWindow(SpeedAlphabetHeight ? SW_SHOW : SW_HIDE);
 
   int CanvasY = ToolbarHeight;
   int CanvasHeight = Height - SpeedAlphabetHeight - CanvasY;
diff --git a/Src/Win32/DasherWindow.h b/Src/Win32/DasherWindow.h
index 7e2e54c..91abc8d 100644
--- a/Src/Win32/DasherWindow.h
+++ b/Src/Win32/DasherWindow.h
@@ -11,7 +11,6 @@
 
 #include "Widgets/Splitter.h"
 #include "Widgets/StatusControl.h"
-#include "Widgets/Menu.h"
 #include "Widgets/SplashScreen.h"
 #include "Widgets/WindowSelect.h"
 #include "DasherMouseInput.h"
@@ -91,7 +90,6 @@ private:
        //CCanvas *m_pCanvas;
        CSplitter *m_pSplitter;
        CStatusControl *m_pSpeedAlphabetBar;
-       CMenu WinMenu;
        //CSplash *Splash;
 
        CAppSettings *m_pAppSettings;
diff --git a/Src/Win32/Dasher_vc2013.vcxproj b/Src/Win32/Dasher_vc2013.vcxproj
index 6052685..5f68e51 100644
--- a/Src/Win32/Dasher_vc2013.vcxproj
+++ b/Src/Win32/Dasher_vc2013.vcxproj
@@ -207,7 +207,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="AppSettings.cpp" />
-    <ClCompile Include="Common\DasherEncodingToCP.cpp" />
     <ClCompile Include="Common\WinWrap.cpp" />
     <ClCompile Include="DasherWindow.cpp" />
     <ClCompile Include="ModuleControl.cpp" />
@@ -220,7 +219,6 @@
     <ClCompile Include="Widgets\ControlPage.cpp" />
     <ClCompile Include="Widgets\Edit.cpp" />
     <ClCompile Include="Widgets\FilenameGUI.cpp" />
-    <ClCompile Include="Widgets\Menu.cpp" />
     <ClCompile Include="Widgets\Prefs.cpp" />
     <ClCompile Include="Widgets\PrefsPageBase.cpp" />
     <ClCompile Include="Widgets\Splitter.cpp" />
@@ -231,7 +229,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="AppSettings.h" />
-    <ClInclude Include="Common\DasherEncodingToCP.h" />
     <ClInclude Include="Common\StringUtils.h" />
     <ClInclude Include="Common\WinWrap.h" />
     <ClInclude Include="DasherAction.h" />
@@ -248,7 +245,6 @@
     <ClInclude Include="Widgets\ControlPage.h" />
     <ClInclude Include="Widgets\Edit.h" />
     <ClInclude Include="Widgets\FilenameGUI.h" />
-    <ClInclude Include="Widgets\Menu.h" />
     <ClInclude Include="Widgets\Prefs.h" />
     <ClInclude Include="Widgets\PrefsPageBase.h" />
     <ClInclude Include="Widgets\Splitter.h" />
diff --git a/Src/Win32/Widgets/Edit.cpp b/Src/Win32/Widgets/Edit.cpp
index 4a2c81a..3e916f0 100644
--- a/Src/Win32/Widgets/Edit.cpp
+++ b/Src/Win32/Widgets/Edit.cpp
@@ -32,8 +32,6 @@
 #include "../resource.h"
 #include "../../DasherCore/DasherInterfaceBase.h"
 
-#include "../Common/DasherEncodingToCP.h"
-
 using namespace Dasher;
 using namespace std;
 using namespace WinLocalisation;
diff --git a/Src/Win32/Widgets/Screen.cpp b/Src/Win32/Widgets/Screen.cpp
index 6c72883..5031306 100644
--- a/Src/Win32/Widgets/Screen.cpp
+++ b/Src/Win32/Widgets/Screen.cpp
@@ -10,8 +10,6 @@
 
 #include "Screen.h"
 
-#include "../Common/DasherEncodingToCP.h"
-// #include "../../DasherCore/CustomColours.h"
 using namespace WinLocalisation;
 using namespace Dasher;
 using namespace Opts;