[dasher: 29/217] Removed MFC dependencies.

[Patrick Welche <pwelche src gnome org>]

commit 57b255f9be2b6b3cc69ce0cd01a4272ce351b0a7
Author: Ron Bessems <ron b promixis com>
Date:   Fri Sep 11 17:26:31 2015 -0400

    Removed MFC dependencies.

 Src/Win32/Dasher.rc           |    3 ++-
 Src/Win32/DasherWindow.cpp    |   14 +++++++-------
 Src/Win32/Widgets/Toolbar.cpp |    2 +-
 Src/Win32/resource.h          |    8 +++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/Src/Win32/Dasher.rc b/Src/Win32/Dasher.rc
index 9d47662..6ab899b 100644
--- a/Src/Win32/Dasher.rc
+++ b/Src/Win32/Dasher.rc
@@ -7,7 +7,8 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include <winres.h>
+#include "windows.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index d48f6e5..9daefa6 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -27,7 +27,7 @@
 
 #include "Widgets/Toolbar.h"
 #include "WinCommon.h"
-#include <afxres.h>
+#include <windows.h>
 #include "resource.h"
 
 #include <Htmlhelp.h>
@@ -226,19 +226,19 @@ LRESULT CDasherWindow::OnCommand(UINT message, WPARAM wParam, LPARAM lParam, BOO
   case ID_EDIT_SELECTALL:
     m_pEdit->SelectAll();
     return 0;
-  case ID_EDIT_CUT:
+  case IDS_EDIT_CUT:
     m_pEdit->Cut();
     return 0;
-  case ID_EDIT_COPY:
+  case IDS_EDIT_COPY:
     m_pEdit->Copy();
     return 0;
   case ID_EDIT_COPY_ALL:
     m_pDasher->CopyToClipboard(m_pDasher->GetAllContext());
     return 0;
-  case ID_EDIT_PASTE:
+  case IDS_EDIT_PASTE:
     m_pEdit->Paste();
     return 0;
-  case ID_FILE_NEW:{
+  case IDS_FILE_NEW:{
     m_pEdit->New();
     // Selecting file->new indicates a new trial to our user logging object
     CUserLogBase* pUserLog = m_pDasher->GetUserLogPtr();
@@ -247,10 +247,10 @@ LRESULT CDasherWindow::OnCommand(UINT message, WPARAM wParam, LPARAM lParam, BOO
     m_pDasher->SetBuffer(0);
     return 0;
   }
-  case ID_FILE_OPEN:
+  case IDS_FILE_OPEN:
     m_pEdit->Open();
     return 0;
-  case ID_FILE_SAVE:
+  case IDS_FILE_SAVE:
     if (!m_pEdit->Save())
       m_pEdit->SaveAs();
     return 0;
diff --git a/Src/Win32/Widgets/Toolbar.cpp b/Src/Win32/Widgets/Toolbar.cpp
index d9d7309..888f85f 100644
--- a/Src/Win32/Widgets/Toolbar.cpp
+++ b/Src/Win32/Widgets/Toolbar.cpp
@@ -11,7 +11,7 @@
 #include "WinCommon.h"
 
 #include "Toolbar.h"
-#include <afxres.h>
+#include <winres.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 851aa80..c8c158d 100644
--- a/Src/Win32/resource.h
+++ b/Src/Win32/resource.h
@@ -7,17 +7,23 @@
 #define IDD_ABOUTBOX                    105
 #define IDM_ABOUT                       106
 #define IDS_FILE_SAVE                   107
+#define ID_FILE_SAVE                                   107
 #define IDM_EXIT                        108
 #define IDS_OPTIONS_PREFS               108
 #define IDS_FILE_OPEN                   109
+#define ID_FILE_OPEN                                   109
 #define IDS_HELLO                       110
 #define IDS_FILE_NEW                    111
+#define ID_FILE_NEW                                            111
 #define IDI_DASHER                      112
 #define IDS_EDIT_CUT                    113
+#define ID_EDIT_CUT                                            113
 #define IDI_SMALL                       114
 #define IDS_EDIT_COPY                   115
+#define ID_EDIT_COPY                                   115
 #define IDC_DASHER                      116
 #define IDS_EDIT_PASTE                  117
+#define ID_EDIT_PASTE                                  117
 #define IDS_EDIT_COPY_ALL               119
 #define IDS_PREFS_TITLE                 140
 #define IDS_PREFS_CONTROL               141
@@ -95,7 +101,7 @@
 #define ID_EDIT_COPY_ALL                32798
 #define ID_IMPORT_TRAINFILE             32799
 #define ID_FILE_APPEND                  32800
-
+#define ID_FILE_SAVE_AS                                        32801
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED