--- a/cpp/TextBox.cpp	Sun Feb 13 08:43:06 2011 +0100
+++ b/cpp/TextBox.cpp	Sun Feb 13 22:51:39 2011 +0100
@@ -6,7 +6,6 @@
     EVT_CHAR (wxTextBox::OnKeyEvent)
 END_EVENT_TABLE ()
 
-
 wxTextBox::wxTextBox(wxWindow *parent, int id, wxString text)
     :wxTextCtrl(parent, id, text, wxDefaultPosition, wxDefaultSize,
             wxTE_PROCESS_ENTER | wxTE_PROCESS_TAB)
@@ -18,13 +17,13 @@
     if (e.GetKeyCode() == WXK_TAB)
     {
         std::cerr << "TAB pressed" << std::endl;
-        wxCommandEvent ce(MainWindow::ID_SKIP_QUESTION);
+        wxCommandEvent ce(EV_SKIP_QUESTION);
         AddPendingEvent(ce);
     }
     else if (e.GetKeyCode() == WXK_RETURN)
     {
         std::cerr << "ENTER pressed" << std::endl;
-        wxCommandEvent ce(MainWindow::ID_SAVE_SENTENCE);
+        wxCommandEvent ce(EV_SAVE_SENTENCE);
         AddPendingEvent(ce);
     }
     else