From e262e7902a9fa48cab9ea503c25f2a97c8cefa1d Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 15 Sep 2006 22:11:08 +0000 Subject: [PATCH] No need for static. --- stepmania/src/arch/ArchHooks/ArchHooks.cpp | 10 ++-------- stepmania/src/arch/ArchHooks/ArchHooks.h | 5 +++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.cpp b/stepmania/src/arch/ArchHooks/ArchHooks.cpp index 8f8b6c073a..333c5c389d 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks.cpp @@ -5,7 +5,6 @@ bool ArchHooks::g_bQuitting = false; bool ArchHooks::g_bToggleWindowed = false; -bool ArchHooks::g_bHasFocus = true; // Keep from pulling RageThreads.h into ArchHooks.h static RageMutex g_Mutex( "ArchHooks" ); ArchHooks *HOOKS = NULL; @@ -33,18 +32,13 @@ ArchHooks *MakeArchHooks() void ArchHooks::SetHasFocus( bool bHasFocus ) { - if( bHasFocus == g_bHasFocus ) + if( bHasFocus == m_bHasFocus ) return; - g_bHasFocus = bHasFocus; + m_bHasFocus = bHasFocus; LOG->Trace( "App %s focus", bHasFocus? "has":"doesn't have" ); } -bool ArchHooks::AppHasFocus() -{ - return g_bHasFocus; -} - bool ArchHooks::GoToURL( RString sUrl ) { return false; diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h index a677bbab29..5311a94c1a 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks.h @@ -4,6 +4,7 @@ class ArchHooks { public: + ArchHooks(): m_bHasFocus(true) { } virtual ~ArchHooks() { } virtual void Init() { } /* @@ -106,7 +107,7 @@ public: /* * Return true if the application has input focus. */ - bool AppHasFocus(); + bool AppHasFocus() const { return m_bHasFocus; } /* * Open a URL in the default web browser @@ -121,7 +122,7 @@ private: static bool g_bQuitting; static bool g_bToggleWindowed; - static bool g_bHasFocus; + bool m_bHasFocus; }; #endif