From ab429334f452a2530ada4f3d81383d8b36bb7dc1 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Sat, 19 Dec 2009 18:47:01 +0000
Subject: [PATCH] fix non-compiling wxdlg code in linux

---
 desmume/src/driver.cpp              | 8 ++++----
 desmume/src/wxdlg/wxdlg3dViewer.cpp | 2 +-
 desmume/src/wxdlg/wxdlg3dViewer.h   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/desmume/src/driver.cpp b/desmume/src/driver.cpp
index d8c13deff..891573d55 100644
--- a/desmume/src/driver.cpp
+++ b/desmume/src/driver.cpp
@@ -56,9 +56,9 @@ public:
 	void NewFrame()
 	{
 		listPolys->SetItemCount(viewer3d_state.polylist.count);
-		labelFrameCounter->SetLabel(wxString::Format("%s: %d",_("Frame"),viewer3d_state.frameNumber));
-		labelUserPolycount->SetLabel(wxString::Format("%s: %d",_("User Polys"),viewer3d_state.polylist.count));
-		labelFinalPolycount->SetLabel(wxString::Format("%s: %d",_("Final Polys"),viewer3d_state.polylist.count));
+		labelFrameCounter->SetLabel(wxString::Format(wxT("Frame: %d"),viewer3d_state.frameNumber));
+		labelUserPolycount->SetLabel(wxString::Format(wxT("User Polys: %d"),viewer3d_state.polylist.count));
+		labelFinalPolycount->SetLabel(wxString::Format(wxT("Final Polys: %d"),viewer3d_state.polylist.count));
 		//tree->DeleteAllItems();
 		//tree->Freeze();
 		//wxTreeItemId root = tree->AddRoot("");
@@ -71,7 +71,7 @@ public:
 
 	virtual wxString OnGetItemText(const wxListCtrl* list, long item, long column) const
 	{
-		return "hi";
+		return wxT("hi");
 	}
 
 	virtual void OnListPolysSelected( wxListEvent& event )
diff --git a/desmume/src/wxdlg/wxdlg3dViewer.cpp b/desmume/src/wxdlg/wxdlg3dViewer.cpp
index 29d4dce00..0fa1c0f9d 100644
--- a/desmume/src/wxdlg/wxdlg3dViewer.cpp
+++ b/desmume/src/wxdlg/wxdlg3dViewer.cpp
@@ -71,7 +71,7 @@ wxdlg3dViewer::wxdlg3dViewer( wxWindow* parent, wxWindowID id, const wxString& c
     Init();
     Create(parent, id, caption, pos, size, style);
 	listPolys->callbacks = this;
-	listPolys->InsertColumn(0,"polys");
+	listPolys->InsertColumn(0,wxT("polys"));
 }
 
 
diff --git a/desmume/src/wxdlg/wxdlg3dViewer.h b/desmume/src/wxdlg/wxdlg3dViewer.h
index a4657efbe..785cdc8a1 100644
--- a/desmume/src/wxdlg/wxdlg3dViewer.h
+++ b/desmume/src/wxdlg/wxdlg3dViewer.h
@@ -96,7 +96,7 @@ public:
     void CreateControls();
 
 	virtual wxString OnGetItemText(const wxListCtrl* list, long item, long column) const { 
-		return "";
+		return wxT("");
 	}
 	virtual void RepaintPanel() {}
 	virtual void _OnPaintPanel( wxPaintEvent& event ) {};