From f78b812d66d1c8df67bafbe73065bea1a2f71aef Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 16 Nov 2015 07:07:02 +1100 Subject: [PATCH] [Project64] Remove CNotification::MakeWindowOnTop --- .../User Interface/Notification Class.cpp | 11 --- .../User Interface/Notification Class.h | 73 +++++++++---------- 2 files changed, 36 insertions(+), 48 deletions(-) diff --git a/Source/Project64/User Interface/Notification Class.cpp b/Source/Project64/User Interface/Notification Class.cpp index 097adf98f..b018433d7 100644 --- a/Source/Project64/User Interface/Notification Class.cpp +++ b/Source/Project64/User Interface/Notification Class.cpp @@ -221,17 +221,6 @@ void CNotification::BringToTop(void) #endif } -void CNotification::MakeWindowOnTop(bool OnTop) -{ - if (m_hWnd == NULL) { return; } - -#if defined(WINDOWS_UI) - m_hWnd->MakeWindowOnTop(OnTop); -#else - g_Notify->BreakPoint(__FILEW__, __LINE__); -#endif -} - void CNotification::ChangeFullScreen(void) const { if (m_hWnd == NULL) { return; } diff --git a/Source/Project64/User Interface/Notification Class.h b/Source/Project64/User Interface/Notification Class.h index c8b76833b..a5807a4cc 100644 --- a/Source/Project64/User Interface/Notification Class.h +++ b/Source/Project64/User Interface/Notification Class.h @@ -15,54 +15,53 @@ class CSettings; class CNotification : - CNotificationSettings + CNotificationSettings { public: - CNotification ( void ); - - void AppInitDone ( void ); + CNotification(void); - // Make sure we are not in full screen - void WindowMode ( void ) const; + void AppInitDone(void); - //Error Messages - virtual void DisplayError(const wchar_t * Message) const; - virtual void DisplayError(LanguageStringID StringID) const; + // Make sure we are not in full screen + void WindowMode(void) const; - virtual void FatalError(const wchar_t * Message) const; - virtual void FatalError(LanguageStringID StringID) const; - - //User Feedback - virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const; - virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const; + //Error Messages + virtual void DisplayError(const wchar_t * Message) const; + virtual void DisplayError(LanguageStringID StringID) const; - virtual void DisplayMessage2(const wchar_t * Message) const; - virtual void BreakPoint(const wchar_t * FileName, const int LineNumber); + virtual void FatalError(const wchar_t * Message) const; + virtual void FatalError(LanguageStringID StringID) const; - void SetWindowCaption ( const wchar_t * Caption ); - - //Remember roms loaded and Rom Dir selected - void AddRecentDir ( const char * RomDir ); + //User Feedback + virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const; + virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const; - //Gui for responses - void SetMainWindow ( CMainGui * Gui ); - void RefreshMenu ( void ); - void HideRomBrowser ( void ); - void ShowRomBrowser ( void ); - void MakeWindowOnTop ( bool OnTop ); - void BringToTop ( void ); - bool ProcessGuiMessages ( void ) const; - void ChangeFullScreen ( void ) const; - void SetGfxPlugin ( CGfxPlugin * Plugin ); + virtual void DisplayMessage2(const wchar_t * Message) const; + virtual void BreakPoint(const wchar_t * FileName, const int LineNumber); + + void SetWindowCaption(const wchar_t * Caption); + + //Remember roms loaded and Rom Dir selected + void AddRecentDir(const char * RomDir); + + //Gui for responses + void SetMainWindow(CMainGui * Gui); + void RefreshMenu(void); + void HideRomBrowser(void); + void ShowRomBrowser(void); + void BringToTop(void); + bool ProcessGuiMessages(void) const; + void ChangeFullScreen(void) const; + void SetGfxPlugin(CGfxPlugin * Plugin); private: - CNotification(const CNotification&); // Disable copy constructor - CNotification& operator=(const CNotification&); // Disable assignment + CNotification(const CNotification&); // Disable copy constructor + CNotification& operator=(const CNotification&); // Disable assignment - CMainGui * m_hWnd; - CGfxPlugin * m_gfxPlugin; + CMainGui * m_hWnd; + CGfxPlugin * m_gfxPlugin; - mutable time_t m_NextMsg; + mutable time_t m_NextMsg; }; -CNotification & Notify ( void ); +CNotification & Notify(void);