Bugs that prevents to compile with wx2.8 fixed
authorlbessard
Fri, 16 Nov 2007 17:41:59 +0100
changeset 316 75691a663ec1
parent 315 1d3bf87b8658
child 317 f1c472b42327
Bugs that prevents to compile with wx2.8 fixed
examples/DS401_Slave_Gui/main.cpp
examples/DS401_Slave_Gui/main.h
--- a/examples/DS401_Slave_Gui/main.cpp	Mon Nov 12 15:17:49 2007 +0100
+++ b/examples/DS401_Slave_Gui/main.cpp	Fri Nov 16 17:41:59 2007 +0100
@@ -696,8 +696,8 @@
 	double		q = 0;
 	int			i = 0;
 	int			j = 0;
-	wxColor		col[8] = {wxColor("BLUE"), wxColor("RED"), wxColor("GREEN"), wxColor("GREY"),
-						wxColor("ORANGE"), wxColor("YELLOW"), wxColor("PINK"), wxColor("BLACK")};
+	wxColor		col[8] = {wxColor(wxT("BLUE")), wxColor(wxT("RED")), wxColor(wxT("GREEN")), wxColor(wxT("GREY")),
+						wxColor(wxT("ORANGE")), wxColor(wxT("YELLOW")), wxColor(wxT("PINK")), wxColor(wxT("BLACK"))};
 	hdelta = hmax - 0;
 	g = (Gtime / hdelta) * 44.00;
 						
--- a/examples/DS401_Slave_Gui/main.h	Mon Nov 12 15:17:49 2007 +0100
+++ b/examples/DS401_Slave_Gui/main.h	Fri Nov 16 17:41:59 2007 +0100
@@ -8,6 +8,7 @@
 #include <wx/listbox.h>
 #include <wx/gauge.h>
 #include <wx/spinctrl.h>
+#include <wx/notebook.h>
 
 class MyApp : public wxApp {
 public: