Merge pull request #5200 from lioncash/frame

Frame: Remove callback function prototypes from header.

Source/Core/DolphinWX/Frame.cpp

@@ -392,9 +392,7 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo
   m_LogWindow->Disable();
 
   InitializeTASDialogs();
-
-  State::SetOnAfterLoadCallback(OnAfterLoadCallback);
-  Core::SetOnStoppedCallback(OnStoppedCallback);
+  InitializeCoreCallbacks();
 
   // Setup perspectives
   if (g_pCodeWindow)
@@ -515,6 +513,20 @@ void CFrame::InitializeTASDialogs()
   });
 }
 
+void CFrame::InitializeCoreCallbacks()
+{
+  // Warning: this gets called from the CPU thread, so we should
+  // only queue things to do on the proper thread
+  State::SetOnAfterLoadCallback([this] {
+    AddPendingEvent(wxCommandEvent{wxEVT_HOST_COMMAND, IDM_UPDATE_GUI});
+  });
+
+  // Warning: this gets called from the EmuThread
+  Core::SetOnStoppedCallback([this] {
+    AddPendingEvent(wxCommandEvent{wxEVT_HOST_COMMAND, IDM_STOPPED});
+  });
+}
+
 bool CFrame::RendererIsFullscreen()
 {
   bool fullscreen = false;
@@ -1025,28 +1037,6 @@ static int GetMenuIDFromHotkey(unsigned int key)
   return -1;
 }
 
-void OnAfterLoadCallback()
-{
-  // warning: this gets called from the CPU thread, so we should only queue things to do on the
-  // proper thread
-  if (main_frame)
-  {
-    wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_GUI);
-    main_frame->GetEventHandler()->AddPendingEvent(event);
-  }
-}
-
-void OnStoppedCallback()
-{
-  // warning: this gets called from the EmuThread, so we should only queue things to do on the
-  // proper thread
-  if (main_frame)
-  {
-    wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_STOPPED);
-    main_frame->GetEventHandler()->AddPendingEvent(event);
-  }
-}
-
 void CFrame::OnKeyDown(wxKeyEvent& event)
 {
 // On OS X, we claim all keyboard events while

Source/Core/DolphinWX/Frame.h

@@ -174,6 +174,7 @@ private:
   wxMenuBar* CreateMenuBar() const;
 
   void InitializeTASDialogs();
+  void InitializeCoreCallbacks();
 
   // Utility
   wxWindow* GetNotebookPageFromId(wxWindowID Id);
@@ -337,6 +338,3 @@ private:
   // Event table
   DECLARE_EVENT_TABLE();
 };
-
-void OnAfterLoadCallback();
-void OnStoppedCallback();