Merge pull request #1233 from Zangetsu38/Zangetsu

Adding the icon on window GL and DX12

Author: tambry

rpcs3/Gui/D3DGSFrame.cpp

@@ -9,6 +9,7 @@ D3DGSFrame::D3DGSFrame()
 	: GSFrame(nullptr, "GSFrame[DirectX 12]")
 	, m_frames(0)
 {
+	SetIcon(wxICON(frame_icon));
 	canvas = new wxWindow(this, wxID_ANY);
 	canvas->SetSize(GetClientSize());
 

rpcs3/Gui/GLGSFrame.cpp

@@ -6,10 +6,15 @@
 #include "D3DGSFrame.h"
 #include "Utilities/Timer.h"
 
+#ifndef _WIN32
+#include "frame_icon.xpm"
+#endif
+
 GLGSFrame::GLGSFrame()
 	: GSFrame(nullptr, "GSFrame[OpenGL]")
 	, m_frames(0)
 {
+	SetIcon(wxICON(frame_icon));
 	canvas = new wxGLCanvas(this, wxID_ANY, NULL);
 	canvas->SetSize(GetClientSize());
 

rpcs3/Gui/MainFrame.cpp

@@ -26,6 +26,10 @@
 #include <wx/dynlib.h>
 #include <wx/progdlg.h>
 
+#ifndef _WIN32
+#include "frame_icon.xpm"
+#endif
+
 BEGIN_EVENT_TABLE(MainFrame, FrameBase)
 	EVT_CLOSE(MainFrame::OnQuit)
 END_EVENT_TABLE()
@@ -117,9 +121,7 @@ MainFrame::MainFrame()
 	menu_help->Append(id_help_about, "&About...");
 
 	SetMenuBar(menubar);
-#ifdef _WIN32
 	SetIcon(wxICON(frame_icon));
-#endif
 
 	// Panels
 	m_log_frame = new LogFrame(this);

rpcs3/Gui/SettingsDialog.h

@@ -7,7 +7,6 @@
 
 #pragma comment(lib, "iphlpapi.lib")
 #else
-#include "frame_icon.xpm"
 
 #include <arpa/inet.h>
 #include <sys/socket.h>