From fae159d2ec3e6673942b85355a44ab141b7ca079 Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Fri, 3 Jun 2011 16:58:08 +0000
Subject: [PATCH] wx: Add window icon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 desmume/src/wx/wxMain.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/desmume/src/wx/wxMain.cpp b/desmume/src/wx/wxMain.cpp
index 36a42bb99..bfecd427c 100644
--- a/desmume/src/wx/wxMain.cpp
+++ b/desmume/src/wx/wxMain.cpp
@@ -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)
 {