# HG changeset patch # User lbessard # Date 1195231319 -3600 # Node ID 75691a663ec1cef5cbde86e7485fefce1f735cf2 # Parent 1d3bf87b8658479be14d11dd02a15d3d6b621aff Bugs that prevents to compile with wx2.8 fixed diff -r 1d3bf87b8658 -r 75691a663ec1 examples/DS401_Slave_Gui/main.cpp --- 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; diff -r 1d3bf87b8658 -r 75691a663ec1 examples/DS401_Slave_Gui/main.h --- 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 #include #include +#include class MyApp : public wxApp { public: