Bugs that prevents to compile with wx2.8 fixed

diff --git a/examples/DS401_Slave_Gui/main.cpp b/examples/DS401_Slave_Gui/main.cpp
index 399b481e63511bee73560c1265595b30d473e874..f1db9413f6cca58b8015887cf3a4f0a4983fab63 100644 (file)
--- a/examples/DS401_Slave_Gui/main.cpp
+++ b/examples/DS401_Slave_Gui/main.cpp
@@ -696,8 +696,8 @@ void MyFrame::Paint()
        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 --git a/examples/DS401_Slave_Gui/main.h b/examples/DS401_Slave_Gui/main.h
index d83e13b2da864f32d2fa8a295946b0f168e337fa..af06428ee8dcf0777641189df6fc6328c8dbbfd8 100644 (file)
--- a/examples/DS401_Slave_Gui/main.h
+++ b/examples/DS401_Slave_Gui/main.h
@@ -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: