[dasher: 22/217] More resource clean-up

[Patrick Welche <pwelche src gnome org>]

commit 3c57a5e9045840a47b98db47a0a97b4d5624ed98
Author: ipomoena <amajorek google com>
Date:   Thu Sep 10 10:23:09 2015 -0700

    More resource clean-up
    
    + added back resource I deleted by mistake.

 Src/Win32/Dasher.rc           |    1 +
 Src/Win32/DasherWindow.cpp    |    2 ++
 Src/Win32/DasherWindow.h      |    2 --
 Src/Win32/Widgets/Menu.cpp    |    1 +
 Src/Win32/Widgets/Toolbar.cpp |    1 +
 Src/Win32/resource.h          |    9 +--------
 6 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/Src/Win32/Dasher.rc b/Src/Win32/Dasher.rc
index 7d8aa8b..015120b 100644
--- a/Src/Win32/Dasher.rc
+++ b/Src/Win32/Dasher.rc
@@ -419,6 +419,7 @@ BEGIN
     IDS_UNTITLED_FILE       "Untitled"
     IDS_UNSAVED_CHANGES     "Unsaved changes"
     IDS_PREFS_LM            "Application"
+    IDS_ERR_SOCKET_TITLE    "Dasher Socket Input error"
 END
 
 #endif    // English (United Kingdom) resources
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index d398bf4..1bec694 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -27,6 +27,8 @@
 
 #include "Widgets/Toolbar.h"
 #include "WinCommon.h"
+#include <afxres.h>
+#include "resource.h"
 
 #include <Htmlhelp.h>
 
diff --git a/Src/Win32/DasherWindow.h b/Src/Win32/DasherWindow.h
index 471e539..7e2e54c 100644
--- a/Src/Win32/DasherWindow.h
+++ b/Src/Win32/DasherWindow.h
@@ -9,8 +9,6 @@
 #ifndef __DasherWindow_h__
 #define __DasherWindow_h__
 
-#include "resource.h"
-
 #include "Widgets/Splitter.h"
 #include "Widgets/StatusControl.h"
 #include "Widgets/Menu.h"
diff --git a/Src/Win32/Widgets/Menu.cpp b/Src/Win32/Widgets/Menu.cpp
index 8e959b9..20b7618 100644
--- a/Src/Win32/Widgets/Menu.cpp
+++ b/Src/Win32/Widgets/Menu.cpp
@@ -9,6 +9,7 @@
 #include "WinCommon.h"
 
 #include "Menu.h"
+#include <afxres.h>
 #include "../resource.h"
 
 // Track memory leaks on Windows to the line that new'd the memory
diff --git a/Src/Win32/Widgets/Toolbar.cpp b/Src/Win32/Widgets/Toolbar.cpp
index aadc9b6..d9d7309 100644
--- a/Src/Win32/Widgets/Toolbar.cpp
+++ b/Src/Win32/Widgets/Toolbar.cpp
@@ -11,6 +11,7 @@
 #include "WinCommon.h"
 
 #include "Toolbar.h"
+#include <afxres.h>
 #include "../resource.h"
 
 // Track memory leaks on Windows to the line that new'd the memory
diff --git a/Src/Win32/resource.h b/Src/Win32/resource.h
index 52d3f3c..28cdaa6 100644
--- a/Src/Win32/resource.h
+++ b/Src/Win32/resource.h
@@ -30,6 +30,7 @@
 #define IDS_PREFS_COLOUR                148
 #define IDS_UNSAVED_CHANGES             149
 #define IDS_PREFS_LM                    151
+#define IDS_ERR_SOCKET_TITLE            156
 #define IDD_CONTROLPAGE                 168
 #define ID_OPTIONS_PREFS                169
 #define IDD_APPEARANCEPAGE              178
@@ -88,19 +89,11 @@
 #define IDC_FONT_VLARGE                 1155
 #define IDC_CHECK4                      1156
 #define IDC_CHECK5                      1157
-#define ID_FILE_NEW                     32771
-#define ID_EDIT_CUT                     32772
-#define ID_EDIT_COPY                    32773
-#define ID_EDIT_PASTE                   32774
 #define ID_EDIT_SELECTALL               32775
 #define ID_HELP_CONTENTS                32776
-#define ID_FILE_SAVE                    32782
-#define ID_FILE_OPEN                    32783
-#define ID_FILE_SAVE_AS                 32791
 #define ID_EDIT_COPY_ALL                32798
 #define ID_IMPORT_TRAINFILE             32799
 #define ID_FILE_APPEND                  32800
-#define IDC_STATIC                      -1
 
 // Next default values for new objects
 //