dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-06 07:05:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1233 from Zangetsu38/Zangetsu

Browse Source 
Adding the icon on window GL and DX12
This commit is contained in:
Raul Tambre 2015-09-28 19:20:17 +03:00
commit 4ac6c23ced
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/Gui/D3DGSFrame.cpp
View File

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

5
rpcs3/Gui/GLGSFrame.cpp
View File

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

6
rpcs3/Gui/MainFrame.cpp
View File

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

1
rpcs3/Gui/SettingsDialog.h
View File

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