From 4b4c37e9bd1e1cfb2570cde2d13c24fdfc2e73e3 Mon Sep 17 00:00:00 2001
From: unknown <rj150@hotmail.com>
Date: Mon, 7 Sep 2015 15:47:44 -0400
Subject: [PATCH] first pass--compiles on VS2013 w/o ATL

---
 .../Project64/N64 System/Debugger/Debugger - Memory Dump.cpp  | 3 +++
 .../N64 System/Debugger/Debugger - Memory Search.cpp          | 3 +++
 Source/Project64/N64 System/Debugger/Debugger - TLB.cpp       | 3 +++
 .../Project64/N64 System/Debugger/Debugger - View Memory.cpp  | 3 +++
 Source/Project64/N64 System/Debugger/Debugger.cpp             | 3 +++
 Source/Project64/User Interface/Gui Class.cpp                 | 2 ++
 Source/Project64/User Interface/Main Menu Class.cpp           | 2 ++
 Source/Project64/User Interface/Settings Config.cpp           | 4 +++-
 .../Settings/Settings Page - Advanced Options.cpp             | 3 +++
 .../User Interface/Settings/Settings Page - Directories.cpp   | 3 +++
 .../Settings/Settings Page - Game - General.cpp               | 3 +++
 .../User Interface/Settings/Settings Page - Game - Plugin.cpp | 3 +++
 .../Settings/Settings Page - Game - Recompiler.cpp            | 3 +++
 .../User Interface/Settings/Settings Page - Game - Status.cpp | 3 +++
 .../User Interface/Settings/Settings Page - Game Browser.cpp  | 3 +++
 .../Settings/Settings Page - Keyboard Shortcuts.cpp           | 3 +++
 .../User Interface/Settings/Settings Page - Options.cpp       | 3 +++
 .../User Interface/Settings/Settings Page - Plugin.cpp        | 3 +++
 Source/Project64/User Interface/Settings/Settings Page.cpp    | 3 +++
 .../Project64/User Interface/WTL Controls/ModifiedEditBox.cpp | 2 ++
 .../Project64/User Interface/WTL Controls/PartialGroupBox.cpp | 3 ++-
 21 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp
index 5ecb12c52..efeeeacd9 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDumpMemory::CDumpMemory(CDebugger * debugger) :
@@ -593,3 +595,4 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
 //	}
 //	return false;
 //}
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp
index 5bd447889..9ea8ddc66 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugMemorySearch::CDebugMemorySearch(CDebugger * debugger) :
@@ -787,3 +789,4 @@ bool CDebugMemorySearch::SearchForValue (DWORD Value, MemorySize Size, DWORD &St
 	}
 	return false;
 }
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp b/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp
index 4f4037824..4662fbb4a 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - TLB.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugTlb::CDebugTlb(CDebugger * debugger) :
@@ -285,3 +287,4 @@ void CDebugTlb::RefreshTLBWindow (void)
 		}
 	}
 }
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp b/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp
index 441a973c9..7973689fb 100644
--- a/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger - View Memory.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CDebugMemoryView::CDebugMemoryView(CDebugger * debugger) :
@@ -470,3 +472,4 @@ void CDebugMemoryView::RefreshMemory ( bool ResetCompare )
 		Insert_MemoryLineDump ( count );
 	}
 }
+#endif
diff --git a/Source/Project64/N64 System/Debugger/Debugger.cpp b/Source/Project64/N64 System/Debugger/Debugger.cpp
index 304f735f9..ea190aaf3 100644
--- a/Source/Project64/N64 System/Debugger/Debugger.cpp	
+++ b/Source/Project64/N64 System/Debugger/Debugger.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Debugger UI.h"
 
 CPj64Module _Module;
@@ -130,3 +132,4 @@ void CDebugger::Debug_ShowMemorySearch()
 		m_MemorySearch->ShowWindow();
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp
index 21fbc3094..024510c94 100644
--- a/Source/Project64/User Interface/Gui Class.cpp	
+++ b/Source/Project64/User Interface/Gui Class.cpp	
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 #include <commctrl.h>
 #include "Settings/SettingType/SettingsType-Application.h"
 
@@ -1253,3 +1254,4 @@ BOOL set_about_field(
         temp_string
     );
 }
+#endif
diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp
index b98ce91cb..a82f66da5 100644
--- a/Source/Project64/User Interface/Main Menu Class.cpp	
+++ b/Source/Project64/User Interface/Main Menu Class.cpp	
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 #include <windows.h>
 #include <commdlg.h>
 
@@ -1240,3 +1241,4 @@ void CMainMenu::ResetMenu(void)
 
 	WriteTrace(TraceDebug,__FUNCTION__ ": Done");
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings Config.cpp b/Source/Project64/User Interface/Settings Config.cpp
index a1ae1d426..566d3c2c8 100644
--- a/Source/Project64/User Interface/Settings Config.cpp	
+++ b/Source/Project64/User Interface/Settings Config.cpp	
@@ -1,4 +1,6 @@
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Config.h"
 #include "Settings/Settings Page.h"
 #include "Settings/SettingType/SettingsType-Application.h"
@@ -339,4 +341,4 @@ void CSettingConfig::BoldChangedPages ( HTREEITEM hItem )
 		::EnableWindow(GetDlgItem(IDC_RESET_ALL), true);
 	}
 }
-
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp
index c91c6e1bc..9e0d7b17a 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CAdvancedOptionsPage::CAdvancedOptionsPage (HWND hParent, const RECT & rcDispay )
@@ -70,3 +72,4 @@ void CAdvancedOptionsPage::ResetPage()
 {
 	CSettingsPageImpl<CAdvancedOptionsPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp b/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp
index a793e3ad3..087ed820f 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Directories.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsDirectoriesPage::COptionsDirectoriesPage (HWND hParent, const RECT & rcDispay ) :
@@ -351,3 +353,4 @@ void COptionsDirectoriesPage::ResetPage()
 
 	SendMessage(GetParent(),PSM_CHANGED,(WPARAM)m_hWnd,0);
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp
index 169a38d87..e5df2baab 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - General.h"
 
@@ -113,3 +115,4 @@ void CGameGeneralPage::ResetPage()
 {
 	CSettingsPageImpl<CGameGeneralPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp
index 5e61a4cb7..5baa50686 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Plugin.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Plugin.h"
 
@@ -345,3 +347,4 @@ void CGamePluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
 		break;
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp
index 91325cfa5..648d0edf1 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Recompiler.h"
 
@@ -94,3 +96,4 @@ void CGameRecompilePage::ResetPage()
 {
 	CSettingsPageImpl<CGameRecompilePage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp
index 8dbc855f2..43360cff5 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Status.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 #include "Settings Page - Game - Status.h"
 
@@ -70,3 +72,4 @@ void CGameStatusPage::ResetPage()
 {
 	CSettingsPageImpl<CGameStatusPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp
index b0ed6195f..6a9171810 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Game Browser.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsGameBrowserPage::COptionsGameBrowserPage (HWND hParent, const RECT & rcDispay ) :
@@ -253,3 +255,4 @@ void COptionsGameBrowserPage::ResetPage()
 	}
 	CSettingsPageImpl<COptionsGameBrowserPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp
index 97514eace..df720dd89 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Keyboard Shortcuts.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionsShortCutsPage::COptionsShortCutsPage (HWND hParent, const RECT & rcDispay ) :
@@ -378,3 +380,4 @@ void COptionsShortCutsPage::ResetPage()
 	m_CurrentKeys.ResetContent();
 	CSettingsPageImpl<COptionsShortCutsPage>::ResetPage();
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp
index 49441f3ea..5187435d8 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Options.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Options.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CGeneralOptionsPage::CGeneralOptionsPage(CSettingConfig * SettingsConfig, HWND hParent, const RECT & rcDispay ) :
@@ -75,3 +77,4 @@ void CGeneralOptionsPage::OnBasicMode ( UINT Code, int id, HWND ctl )
 	CheckBoxChanged(Code,id,ctl);
 	m_SettingsConfig->UpdateAdvanced((int)::SendMessage(ctl, BM_GETCHECK, 0, 0) == 0);
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp b/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp
index 9a1d603c2..8658164ba 100644
--- a/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page - Plugin.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 COptionPluginPage::COptionPluginPage (HWND hParent, const RECT & rcDispay )
@@ -331,3 +333,4 @@ void COptionPluginPage::HleAudioChanged ( UINT /*Code*/, int id, HWND /*ctl*/ )
 		break;
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/Settings/Settings Page.cpp b/Source/Project64/User Interface/Settings/Settings Page.cpp
index 6c63fdd5f..f7b26d581 100644
--- a/Source/Project64/User Interface/Settings/Settings Page.cpp	
+++ b/Source/Project64/User Interface/Settings/Settings Page.cpp	
@@ -9,6 +9,8 @@
 *                                                                           *
 ****************************************************************************/
 #include "stdafx.h"
+
+#ifdef WINDOWS_UI
 #include "Settings Page.h"
 
 CConfigSettingSection::CConfigSettingSection( LPCWSTR PageTitle ) :
@@ -39,3 +41,4 @@ CSettingsPage * CConfigSettingSection::GetPage ( int PageNo )
 	}
 	return m_Pages[PageNo];
 }
+#endif
diff --git a/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp b/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp
index 6c3d5854b..826655802 100644
--- a/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp	
+++ b/Source/Project64/User Interface/WTL Controls/ModifiedEditBox.cpp	
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 CModifiedEditBox::CModifiedEditBox(bool bString /* = true */, HWND hWnd /* = NULL */) :
 	CEdit(hWnd),
 	m_Changed(false),
@@ -103,3 +104,4 @@ void CModifiedEditBox::SetTextField (HWND hWnd)
 		::SendMessage(m_TextField,WM_SETFONT,(WPARAM)m_BoldFont,0);
 	}
 }
+#endif
diff --git a/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp b/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp
index 1772d2ab5..b50b99619 100644
--- a/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp	
+++ b/Source/Project64/User Interface/WTL Controls/PartialGroupBox.cpp	
@@ -10,6 +10,7 @@
 ****************************************************************************/
 #include "stdafx.h"
 
+#ifdef WINDOWS_UI
 BOOL CPartialGroupBox::Attach(HWND hWnd)
 {
 	ATLASSUME(m_hWnd == NULL);
@@ -118,5 +119,5 @@ void CPartialGroupBox::OnPaint(HDC /*hDC*/)
 
 		dc.DrawTextW(grptext,-1,fontrect,DT_SINGLELINE|DT_LEFT);
 	}
-
 }
+#endif