From f27e77c7e0aa7729ad29ee3d9f9144a8ac27d67f Mon Sep 17 00:00:00 2001
From: Zangetsu38 <Dante38@free.fr>
Date: Sun, 27 Sep 2015 00:36:44 +0200
Subject: [PATCH] Adding the icon on window GL and DX12

---
 rpcs3/Gui/D3DGSFrame.cpp   | 1 +
 rpcs3/Gui/GLGSFrame.cpp    | 5 +++++
 rpcs3/Gui/MainFrame.cpp    | 6 ++++--
 rpcs3/Gui/SettingsDialog.h | 1 -
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Gui/D3DGSFrame.cpp b/rpcs3/Gui/D3DGSFrame.cpp
index 48d31e2237..808251f130 100644
--- a/rpcs3/Gui/D3DGSFrame.cpp
+++ b/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());
 
diff --git a/rpcs3/Gui/GLGSFrame.cpp b/rpcs3/Gui/GLGSFrame.cpp
index a5419f5c3f..def20179f3 100644
--- a/rpcs3/Gui/GLGSFrame.cpp
+++ b/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());
 
diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp
index 2480698797..9c61166ac0 100644
--- a/rpcs3/Gui/MainFrame.cpp
+++ b/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);
diff --git a/rpcs3/Gui/SettingsDialog.h b/rpcs3/Gui/SettingsDialog.h
index bf514c45e1..8786a84850 100644
--- a/rpcs3/Gui/SettingsDialog.h
+++ b/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>