Move Windows related functions to Interface.h (PR #882)

This is not complete as header files from Windows/.. are still included in:

Keyboard.cpp
SerialComms.cpp
Joystick.cpp

But probably these are arch specific and will have to be completely reimplemented elsewhere.

source/CmdLine.cpp

@@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "ParallelPrinter.h"
 #include "CardManager.h"
 #include "SerialComms.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 
 CmdLine g_cmdLine;
 std::string g_sConfigFile; // INI file to use instead of Registry

source/Disk.cpp

@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "SaveState_Structs_v1.h"
 
-#include "Windows/AppleWin.h"
+#include "Interface.h"
 #include "Core.h"
 #include "CPU.h"
 #include "DiskImage.h"
@@ -43,8 +43,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Registry.h"
 #include "SaveState.h"
 #include "Video.h"
-#include "Windows/WinVideo.h"
-#include "Windows/WinFrame.h"
 #include "YamlHelper.h"
 
 #include "../resource/resource.h"

source/Frame.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// 1.19.0.0 Hard Disk Status/Indicator Light
-#define HD_LED 1
-
 	UINT GetFrameBufferBorderlessWidth(void);
 	UINT GetFrameBufferBorderlessHeight(void);
 	UINT GetFrameBufferBorderWidth(void);

source/Harddisk.cpp

@@ -30,12 +30,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "Harddisk.h"
 #include "Core.h"
-#include "Windows/AppleWin.h"
+#include "Interface.h"
 #include "CardManager.h"
 #include "CPU.h"
 #include "DiskImage.h"	// ImageError_e, Disk_Status_e
 #include "DiskImageHelper.h"
-#include "Windows/WinFrame.h"
 #include "Memory.h"
 #include "Registry.h"
 #include "SaveState.h"

source/Harddisk.h

@@ -25,6 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "DiskImage.h"
 
+// 1.19.0.0 Hard Disk Status/Indicator Light
+#define HD_LED 1
+
 	enum HardDrive_e
 	{
 		HARDDISK_1 = 0,

source/Interface.h

@@ -0,0 +1,20 @@
+#pragma once
+
+extern HINSTANCE  g_hInstance;
+extern HWND       g_hFrameWindow;
+extern BOOL       g_bConfirmReboot; // saved PageConfig REGSAVE
+extern BOOL       g_bMultiMon;
+
+void	FrameDrawDiskLEDS(HDC hdc);
+void	FrameDrawDiskStatus(HDC hdc);
+void	FrameRefreshStatus(int, bool bUpdateDiskStatus = true);
+void	FrameUpdateApple2Type();
+void    FrameSetCursorPosByMousePos();
+
+void	VideoRedrawScreen();
+void	SetFullScreenShowSubunitStatus(bool bShow);
+bool	GetBestDisplayResolutionForFullScreen(UINT& bestWidth, UINT& bestHeight, UINT userSpecifiedHeight = 0);
+int		SetViewportScale(int nNewScale, bool bForce = false);
+void	SetAltEnterToggleFullScreen(bool mode);
+
+void	SetLoadedSaveStateFlag(const bool bFlag);

source/Memory.cpp

@@ -31,11 +31,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "StdAfx.h"
 
 #include "Memory.h"
+#include "Interface.h"
 #include "Core.h"
 #include "CardManager.h"
 #include "CPU.h"
 #include "Disk.h"
-#include "Windows/WinFrame.h"
 #include "Harddisk.h"
 #include "Joystick.h"
 #include "Keyboard.h"

source/MouseInterface.cpp

@@ -49,7 +49,7 @@ Etc.
 #include "Core.h"	// g_SynchronousEventMgr
 #include "CardManager.h"
 #include "CPU.h"
-#include "Windows/WinFrame.h"	// FrameSetCursorPosByMousePos()
+#include "Interface.h"	// FrameSetCursorPosByMousePos()
 #include "Log.h"
 #include "Memory.h"
 #include "Video.h"

source/NTSC_CharSet.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "StdAfx.h"
 #include "NTSC_CharSet.h"
-#include "Windows/AppleWin.h"
+#include "Interface.h"
 #include "Core.h"
 #include "../resource/resource.h"
 #include "Video.h"

source/Pravets.cpp

@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "Pravets.h"
 #include "Core.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 #include "Keyboard.h"
 #include "Tape.h"
 

source/SaveState.cpp

@@ -31,12 +31,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "SaveState.h"
 #include "YamlHelper.h"
 
-#include "Windows/AppleWin.h"
+#include "Interface.h"
 #include "CardManager.h"
 #include "CPU.h"
 #include "Debug.h"
 #include "Disk.h"
-#include "Windows/WinFrame.h"
 #include "Joystick.h"
 #include "Keyboard.h"
 #include "LanguageCard.h"

source/SoundCore.cpp

@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "SoundCore.h"
 #include "Core.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 #include "Log.h"
 #include "Speaker.h"
 

source/Speaker.cpp

@@ -31,11 +31,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Speaker.h"
 #include "Core.h"
 #include "CPU.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 #include "Log.h"
 #include "Memory.h"
 #include "SoundCore.h"
-#include "Windows/WinVideo.h"	// VideoRedrawScreen()
 #include "YamlHelper.h"
 #include "Riff.h"
 

source/Utilities.cpp

@@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "SerialComms.h"
 #include "Speaker.h"
 #include "Mockingboard.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 
 #include "Configuration/IPropertySheet.h"
 #include "Tfe/Tfe.h"

source/Video.cpp

@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include "Core.h"
 #include "CPU.h"
 #include "Frame.h"
-#include "Windows/WinFrame.h"
+#include "Interface.h"
 #include "Log.h"
 #include "Memory.h"
 #include "Registry.h"

source/Windows/WinFrame.h

@@ -1,8 +1,5 @@
 #pragma once
 
-// 1.19.0.0 Hard Disk Status/Indicator Light
-#define HD_LED 1
-
 // Win32
 	extern HWND       g_hFrameWindow;
 	extern int        g_nViewportCX;