From c41f587c291cc8216c1d9c40254eea5d776d2699 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 6 Feb 2017 17:26:30 -0500 Subject: [PATCH] Frame: Hide functions that don't need to be exposed Any functions left exposed are used elsewhere through the main_window global. May as well prevent any more functions from being used in that manner where possible. --- Source/Core/DolphinWX/Frame.h | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index 1ee82ed621..e679bed2c7 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -90,29 +90,16 @@ public: wxCheatsWindow* g_CheatsWindow = nullptr; TASInputDlg* g_TASInputDlg[8]; - void DoPause(); void DoStop(); - bool TriggerSTMPowerEvent(); - void OnStopped(); - void DoRecordingSave(); void UpdateGUI(); void UpdateGameList(); void ToggleLogWindow(bool bShow); void ToggleLogConfigWindow(bool bShow); - void PostEvent(wxCommandEvent& event); void StatusBarMessage(const char* Text, ...); void ClearStatusBar(); - void OnRenderWindowSizeRequest(int width, int height); void BootGame(const std::string& filename); - void OnRenderParentClose(wxCloseEvent& event); - void OnRenderParentMove(wxMoveEvent& event); bool RendererHasFocus(); bool RendererIsFullscreen(); - void DoFullscreen(bool enable_fullscreen); - void DoExclusiveFullscreen(bool enable_fullscreen); - void ToggleDisplayMode(bool bFullscreen); - static void ConnectWiimote(int wm_idx, bool connect); - void UpdateTitle(const std::string& str); void OpenGeneralConfiguration(wxWindowID tab_id = wxID_ANY); const CGameListCtrl* GetGameListCtrl() const; @@ -234,7 +221,25 @@ private: // Override window proc for tricks like screensaver disabling WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); #endif + + void DoOpen(bool Boot); + void DoPause(); + void DoToggleToolbar(bool); + void DoRecordingSave(); + void DoFullscreen(bool enable_fullscreen); + void DoExclusiveFullscreen(bool enable_fullscreen); + void ToggleDisplayMode(bool bFullscreen); + bool TriggerSTMPowerEvent(); + void OnStopped(); + void OnRenderWindowSizeRequest(int width, int height); + void UpdateTitle(const std::string& str); + static void ConnectWiimote(int wm_idx, bool connect); + // Event functions + void PostEvent(wxCommandEvent& event); + void OnRenderParentClose(wxCloseEvent& event); + void OnRenderParentMove(wxMoveEvent& event); + void OnQuit(wxCommandEvent& event); void OnHelp(wxCommandEvent& event); @@ -247,7 +252,6 @@ private: void UpdateLoadWiiMenuItem() const; void OnOpen(wxCommandEvent& event); // File menu - void DoOpen(bool Boot); void OnRefresh(wxCommandEvent& event); void OnBootDrive(wxCommandEvent& event); @@ -293,7 +297,6 @@ private: void OnMove(wxMoveEvent& event); void OnResize(wxSizeEvent& event); void OnToggleToolbar(wxCommandEvent& event); - void DoToggleToolbar(bool); void OnToggleStatusbar(wxCommandEvent& event); void OnToggleWindow(wxCommandEvent& event);