ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wx: Add window icon 

This is not portable on windows and actually it's not even
working here. Anyway it should be working for Jan
otherwise it wouldn't have posted the patch right? :)

From: Jan Bücken (nooris), #3301520
This commit is contained in:
riccardom 2011-06-03 16:58:08 +00:00
parent b7a9d5085f
commit fae159d2ec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desmume/src/wx/wxMain.cpp
View File

@ -37,6 +37,8 @@
#include "aggdraw.h"
#endif
#include "DeSmuME.xpm"
#ifndef WIN32
#define lstrlen(a) strlen((a))
#endif
@ -699,7 +701,7 @@ void DesmumeFrame::Modify_SPUMode(wxCommandEvent &event)
}
SPU_SetSynchMode(syncMode, syncMethod);
}
/*************** DesmumeFrame class "loadmenu" functions and the frame ******************/
DesmumeFrame::DesmumeFrame(const wxString& title)
@ -707,14 +709,15 @@ DesmumeFrame::DesmumeFrame(const wxString& title)
{
history = new wxFileHistory;
wxMenuBar *menuBar = new wxMenuBar();
LoadSettings();
SetIcon(wxIcon(wxT("DeSmuME.xpm")));
loadmenuBar(menuBar);
ChangeRotation(nds_screen_rotation_angle, false);
SetMenuBar(menuBar);
}
}
void DesmumeFrame::loadfileMenu(wxMenu *fileMenu)
{