Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-21 23:16:39 +00:00
Code Issues Projects Releases Wiki Activity

IPropertySheet: make it a standard C++ class with pure virtual functions (PR #892)

Browse Source 
* Interface.h: ensure that functions in the interface are not exported by other header files.

This is generally harmless, except for the presence of default arguments, in which case the version with default arguments must come first.
To avoid the issue, these functions are only ever exported in the Interface.h header file.
This commit is contained in:
Andrea
2020-12-20 15:32:51 +00:00
committed by GitHub
parent 3cb8f3bb52
commit 2d2ba86f4f
24 changed files with 82 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Joystick.cpp
+5 -4
View File
@@ -44,6 +44,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "CPU.h"
#include "Memory.h"
#include "YamlHelper.h"
#include "Interface.h"
#include "Configuration/PropertySheet.h"
@@ -344,7 +345,7 @@ BOOL JoyProcessKey(int virtkey, bool extended, bool down, bool autorep)
BOOL keychange = 0;
bool bIsCursorKey = false;
const bool swapButtons0and1 = sg_PropertySheet.GetButtonsSwapState();
const bool swapButtons0and1 = GetPropertySheet().GetButtonsSwapState();
if (virtKeyWithExtended == g_buttonVirtKey[!swapButtons0and1 ? 0 : 1])
{
@@ -433,7 +434,7 @@ BOOL JoyProcessKey(int virtkey, bool extended, bool down, bool autorep)
buttonlatch[1] = BUTTONTIME;
}
}
else if ((down && !autorep) || (sg_PropertySheet.GetJoystickCenteringControl() == JOYSTICK_MODE_CENTERING))
else if ((down && !autorep) || (GetPropertySheet().GetJoystickCenteringControl() == JOYSTICK_MODE_CENTERING))
{
int xkeys = 0;
int ykeys = 0;
@@ -488,7 +489,7 @@ BOOL JoyProcessKey(int virtkey, bool extended, bool down, bool autorep)
ypos[nJoyNum] = PDL_CENTRAL + g_nPdlTrimY;
}
if (bIsCursorKey && sg_PropertySheet.GetJoystickCursorControl())
if (bIsCursorKey && GetPropertySheet().GetJoystickCursorControl())
{
// Allow AppleII keyboard to see this cursor keypress too
return 0;
@@ -505,7 +506,7 @@ static void DoAutofire(UINT uButton, BOOL& pressed)
static BOOL lastPressed[3] = {0};
BOOL nowPressed = pressed;
if (sg_PropertySheet.GetAutofire(uButton) && pressed)
if (GetPropertySheet().GetAutofire(uButton) && pressed)
{
toggle[uButton] = (!lastPressed[uButton]) ? TRUE : !toggle[uButton];
pressed = pressed && toggle[uButton];