From c0a86d6c4428e72f710a10321802a2cf5aae99d8 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 30 Dec 2005 03:59:10 +0000 Subject: [PATCH] use HOOKS->SetHasFocus --- stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp | 3 +-- stepmania/src/archutils/Win32/GraphicsWindow.cpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp index 61e2cf5e48..a663be88f3 100644 --- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp +++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp @@ -3,7 +3,6 @@ #include "SDL_utils.h" #include "RageLog.h" #include "RageDisplay.h" // for REFRESH_DEFAULT -#include "StepMania.h" #include "arch/ArchHooks/ArchHooks.h" #include "DisplayResolutions.h" @@ -215,7 +214,7 @@ void LowLevelWindow_SDL::Update() { uint8_t i = SDL_GetAppState(); LOG->Trace( "SDL_GetAppState: %i", i ); - StepMania::FocusChanged( i&SDL_APPINPUTFOCUS && i&SDL_APPACTIVE ); + HOOKS->SetHasFocus( i&SDL_APPINPUTFOCUS && i&SDL_APPACTIVE ); } break; case SDL_QUIT: diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp index 846bbb0e9c..f0f3a3d171 100644 --- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp +++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp @@ -6,7 +6,7 @@ #include "RageUtil.h" #include "RageDisplay.h" #include "DisplayResolutions.h" -#include "arch/ArchHooks/ArchHooks_Win32.h" +#include "arch/ArchHooks/ArchHooks.h" #include "archutils/Win32/AppInstance.h" #include "archutils/Win32/WindowIcon.h" #include "archutils/Win32/GetFileInformation.h" @@ -60,9 +60,8 @@ LRESULT CALLBACK GraphicsWindow::GraphicsWindow_WndProc( HWND hWnd, UINT msg, WP const bool bInactive = (LOWORD(wParam) == WA_INACTIVE); const bool bMinimized = (HIWORD(wParam) != 0); const bool bHadFocus = g_bHasFocus; - LOG->Trace("WM_ACTIVATE (%i, %i)", - bInactive, bMinimized ); g_bHasFocus = !bInactive && !bMinimized; + LOG->Trace( "WM_ACTIVATE (%i, %i): %s", bInactive, bMinimized, g_bHasFocus? "has focus":"doesn't have focus" ); if( !g_bHasFocus ) { CString sName = GetNewWindow(); @@ -457,7 +456,7 @@ void GraphicsWindow::Update() DispatchMessage( &msg ); } - StepMania::FocusChanged( g_bHasFocus ); + HOOKS->SetHasFocus( g_bHasFocus ); if( g_bResolutionChanged && DISPLAY != NULL ) {