ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Remove CNotification::MakeWindowOnTop

This commit is contained in:
zilmar 2015-11-16 07:07:02 +11:00
parent 1a4166a1de
commit f78b812d66
2 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Project64/User Interface/Notification Class.cpp
View File

@ -221,17 +221,6 @@ void CNotification::BringToTop(void)
#endif #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 void CNotification::ChangeFullScreen(void) const
{ {
if (m_hWnd == NULL) { return; } if (m_hWnd == NULL) { return; }

73
Source/Project64/User Interface/Notification Class.h
View File

@ -15,54 +15,53 @@
class CSettings; class CSettings;
class CNotification : class CNotification :
CNotificationSettings CNotificationSettings
{ {
public: public:
CNotification ( void ); CNotification(void);
void AppInitDone ( void );
// Make sure we are not in full screen void AppInitDone(void);
void WindowMode ( void ) const;
//Error Messages // Make sure we are not in full screen
virtual void DisplayError(const wchar_t * Message) const; void WindowMode(void) const;
virtual void DisplayError(LanguageStringID StringID) const;
virtual void FatalError(const wchar_t * Message) const; //Error Messages
virtual void FatalError(LanguageStringID StringID) const; virtual void DisplayError(const wchar_t * Message) const;
virtual void DisplayError(LanguageStringID StringID) const;
//User Feedback
virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const;
virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const;
virtual void DisplayMessage2(const wchar_t * Message) const; virtual void FatalError(const wchar_t * Message) const;
virtual void BreakPoint(const wchar_t * FileName, const int LineNumber); virtual void FatalError(LanguageStringID StringID) const;
void SetWindowCaption ( const wchar_t * Caption ); //User Feedback
virtual void DisplayMessage(int DisplayTime, const wchar_t * Message) const;
//Remember roms loaded and Rom Dir selected virtual void DisplayMessage(int DisplayTime, LanguageStringID StringID) const;
void AddRecentDir ( const char * RomDir );
//Gui for responses virtual void DisplayMessage2(const wchar_t * Message) const;
void SetMainWindow ( CMainGui * Gui ); virtual void BreakPoint(const wchar_t * FileName, const int LineNumber);
void RefreshMenu ( void );
void HideRomBrowser ( void ); void SetWindowCaption(const wchar_t * Caption);
void ShowRomBrowser ( void );
void MakeWindowOnTop ( bool OnTop ); //Remember roms loaded and Rom Dir selected
void BringToTop ( void ); void AddRecentDir(const char * RomDir);
bool ProcessGuiMessages ( void ) const;
void ChangeFullScreen ( void ) const; //Gui for responses
void SetGfxPlugin ( CGfxPlugin * Plugin ); 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: private:
CNotification(const CNotification&); // Disable copy constructor CNotification(const CNotification&); // Disable copy constructor
CNotification& operator=(const CNotification&); // Disable assignment CNotification& operator=(const CNotification&); // Disable assignment
CMainGui * m_hWnd; CMainGui * m_hWnd;
CGfxPlugin * m_gfxPlugin; CGfxPlugin * m_gfxPlugin;
mutable time_t m_NextMsg; mutable time_t m_NextMsg;
}; };
CNotification & Notify ( void ); CNotification & Notify(void);