From 6e312dce91f3b5cbb895f2d60d7eea294fdbc2d5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 6 Aug 2014 22:24:08 -0400 Subject: [PATCH] Core: Remove Core::GetWindowHandle Finally, it's unused. Whoa. --- Source/Core/Core/Core.cpp | 5 ----- Source/Core/Core/Core.h | 3 --- Source/Core/DolphinWX/Frame.cpp | 8 -------- Source/Core/DolphinWX/FrameTools.cpp | 12 ------------ 4 files changed, 28 deletions(-) diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 91a2299afd..b37ac0a3e6 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -138,11 +138,6 @@ void DisplayMessage(const std::string& message, int time_in_ms) } } -void *GetWindowHandle() -{ - return g_pWindowHandle; -} - bool IsRunning() { return (GetState() != CORE_UNINITIALIZED) || g_bHwInit; diff --git a/Source/Core/Core/Core.h b/Source/Core/Core/Core.h index 1a079ac8ed..4e8918e44e 100644 --- a/Source/Core/Core/Core.h +++ b/Source/Core/Core/Core.h @@ -59,9 +59,6 @@ void SaveScreenShot(); void Callback_WiimoteInterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size); -void* GetWindowHandle(); - - // This displays messages in a user-visible way. void DisplayMessage(const std::string& message, int time_in_ms); diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index e9edc83517..b710ba07cb 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -2,14 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -// CFrame is the main parent window. Inside CFrame there is an m_Panel that is -// the parent for the rendering window (when we render to the main window). In -// Windows the rendering window is created by giving CreateWindow() -// m_Panel->GetHandle() as parent window and creating a new child window to -// m_Panel. The new child window handle that is returned by CreateWindow() can -// be accessed from Core::GetWindowHandle(). - #ifdef __APPLE__ #include #endif diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index 039b6370a3..a9334686fc 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -2,18 +2,6 @@ // Licensed under GPLv2 // Refer to the license.txt file included. - -/* -1.1 Windows - -CFrame is the main parent window. Inside CFrame there is m_Panel which is the -parent for the rendering window (when we render to the main window). In Windows -the rendering window is created by giving CreateWindow() m_Panel->GetHandle() -as parent window and creating a new child window to m_Panel. The new child -window handle that is returned by CreateWindow() can be accessed from -Core::GetWindowHandle(). -*/ - #include #include #include