GUI fixes

This commit is contained in:
Nekotekina 2015-11-26 10:37:53 +03:00
parent f3311bb5e5
commit b18e337781
16 changed files with 30 additions and 26 deletions

View file

@ -6,10 +6,6 @@
#include "rpcs3.h"
#include "Utilities/Timer.h"
#ifndef _WIN32
#include "frame_icon.xpm"
#endif
BEGIN_EVENT_TABLE(GSFrame, wxFrame)
EVT_PAINT(GSFrame::OnPaint)
EVT_SIZE(GSFrame::OnSize)
@ -17,7 +13,7 @@ END_EVENT_TABLE()
GSFrame::GSFrame(const wxString& title) : wxFrame(nullptr, wxID_ANY, "GSFrame[" + title + "]")
{
SetIcon(wxICON(frame_icon));
SetIcon(wxGetApp().m_MainFrame->GetIcon());
CellVideoOutResolution res = ResolutionTable[ResolutionIdToNum((u32)rpcs3::state.config.rsx.resolution.value())];
SetClientSize(res.width, res.height);