From d6eb91be7e063a3f65421724900a892b8cc1afd3 Mon Sep 17 00:00:00 2001
From: tomch <tomch@b5e51362-a710-0410-a134-be2176fc2e42>
Date: Sun, 24 Aug 2008 21:50:35 +0000
Subject: [PATCH] Bumped version to 1.15.0 for CP/M beta support Made PrintScrn
 support conditional on _DEBUG

---
 AppleWin/docs/History.txt     | 9 +++++++++
 AppleWin/resource/Applewin.rc | 8 ++++----
 AppleWin/source/Applewin.cpp  | 6 ++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/AppleWin/docs/History.txt b/AppleWin/docs/History.txt
index 5a9af1d4..6e7b473c 100644
--- a/AppleWin/docs/History.txt
+++ b/AppleWin/docs/History.txt
@@ -17,6 +17,15 @@ Restrictions/bugs:
 - SSI263 emulation is very basic: there is no attempt to emulate rate, inflection or filters.
 - During Mockingboard playback, Speaker emulation isn't precise
 
+1.15.0 - 24 Aug 2008
+--------------------
+Changes:
+. Beta: CP/M support (Microsoft CP/M SoftCard in slot-5)
+  - No save-state support
+  - No Z80 debugging support
+
+Fixes:
+. '~' displayed instead of '^' 
 
 1.14.2.0 - 23 Jun 2008
 ----------------------
diff --git a/AppleWin/resource/Applewin.rc b/AppleWin/resource/Applewin.rc
index 7d6ba646..451ab679 100644
--- a/AppleWin/resource/Applewin.rc
+++ b/AppleWin/resource/Applewin.rc
@@ -230,8 +230,8 @@ DISK_ICON               ICON                    "DISK.ICO"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,14,2,0
- PRODUCTVERSION 1,14,2,0
+ FILEVERSION 1,15,0,0
+ PRODUCTVERSION 1,15,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -249,12 +249,12 @@ BEGIN
             VALUE "Comments", "http://applewin.berlios.de"
             VALUE "CompanyName", "Michael O'Brien, Oliver Schmidt, Tom Charlesworth"
             VALUE "FileDescription", "Apple //e Emulator for Windows"
-            VALUE "FileVersion", "1, 14, 2, 0"
+            VALUE "FileVersion", "1, 15, 0, 0"
             VALUE "InternalName", "APPLEWIN"
             VALUE "LegalCopyright", "© 1994-2008 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
             VALUE "OriginalFilename", "APPLEWIN.EXE"
             VALUE "ProductName", "Apple //e Emulator"
-            VALUE "ProductVersion", "1, 14, 2, 0"
+            VALUE "ProductVersion", "1, 15, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/AppleWin/source/Applewin.cpp b/AppleWin/source/Applewin.cpp
index 18e2fc7e..5110f06f 100644
--- a/AppleWin/source/Applewin.cpp
+++ b/AppleWin/source/Applewin.cpp
@@ -565,7 +565,7 @@ void RegisterExtensions ()
 }
 
 //===========================================================================
-void ApppleWin_RegisterHotKeys()
+void AppleWin_RegisterHotKeys()
 {
 	BOOL bStatus = RegisterHotKey(      
 		g_hFrameWindow	, // HWND hWnd
@@ -792,7 +792,9 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 		MemInitialize();
 		VideoInitialize();
 		FrameCreateWindow();
-		ApppleWin_RegisterHotKeys(); // needs valid g_hFrameWindow
+#ifdef _DEBUG
+		AppleWin_RegisterHotKeys(); // needs valid g_hFrameWindow
+#endif
 
 		// Need to test if it's safe to call ResetMachineState(). In the meantime, just call DiskReset():
 		DiskReset();	// Switch from a booting A][+ to a non-autostart A][, so need to turn off floppy motor