--- a/cpp/MainWindow.cpp	Sun Feb 13 08:43:06 2011 +0100
+++ b/cpp/MainWindow.cpp	Sun Feb 13 22:51:39 2011 +0100
@@ -5,10 +5,14 @@
 #include "TextBox.hpp"
 
 BEGIN_EVENT_TABLE (MainWindow, wxFrame)
-    EVT_COMMAND (wxID_ANY, ID_SKIP_QUESTION, MainWindow::OnSkipQuestion )
-    EVT_COMMAND (wxID_ANY, ID_SAVE_SENTENCE, MainWindow::OnSaveSentence )
+    EVT_COMMAND (wxID_ANY, EV_SKIP_QUESTION, MainWindow::OnSkipQuestion )
+    EVT_COMMAND (wxID_ANY, EV_SAVE_SENTENCE, MainWindow::OnSaveSentence )
 END_EVENT_TABLE ()
 
+DEFINE_EVENT_TYPE(EV_SKIP_QUESTION)
+DEFINE_EVENT_TYPE(EV_SAVE_SENTENCE)
+
+
 MainWindow::MainWindow()
     :wxFrame(0, wxID_ANY, _("Lingvigilo"), wxDefaultPosition, wxDefaultSize,
             wxSTAY_ON_TOP)

--- a/cpp/MainWindow.hpp	Sun Feb 13 08:43:06 2011 +0100
+++ b/cpp/MainWindow.hpp	Sun Feb 13 22:51:39 2011 +0100
@@ -4,15 +4,14 @@
 #include <wx/wx.h>
 #include <wx/event.h>
 
+BEGIN_DECLARE_EVENT_TYPES()
+    DECLARE_EVENT_TYPE(EV_SKIP_QUESTION, -1)
+    DECLARE_EVENT_TYPE(EV_SAVE_SENTENCE, -2)
+END_DECLARE_EVENT_TYPES()
+
 class MainWindow : public wxFrame
 {
     public:
-        enum
-        {
-            ID_SKIP_QUESTION,
-            ID_SAVE_SENTENCE
-        };
-
         MainWindow();
 
         void OnSkipQuestion(wxCommandEvent &e);

--- 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