From 8121c6ab4c90104e76a44c0217aecd865784a1ee Mon Sep 17 00:00:00 2001
From: Antoine Fraboulet <antoine.fraboulet@free.fr>
Date: Tue, 29 Mar 2005 08:22:55 +0000
Subject: [PATCH] raccords and benjamins are now search active

---
 dic/automaton.h    | 10 +++++-----
 wxwin/auxframes.cc | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dic/automaton.h b/dic/automaton.h
index 9c605b4..a5b037e 100644
--- a/dic/automaton.h
+++ b/dic/automaton.h
@@ -16,7 +16,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 /*
- * $Id: automaton.h,v 1.1 2004/06/20 20:13:59 afrab Exp $
+ * $Id: automaton.h,v 1.2 2005/03/29 08:22:55 afrab Exp $
  */
 
 #ifndef _DIC_AUTOMATON_H_
@@ -26,15 +26,15 @@ struct _automaton {
   int nterm;
   int nstate;
   int init;
-  int **Dtrans;  
+  int **Dtrans;
   int *accept;
-  int  *marque;   
+  int *marque;
 };
 
 typedef struct _automaton* automaton;
 
-int automaton_build(automaton *a, int init_state, int *ptl, int *PS);
+int  automaton_build (automaton *a, int init_state, int *ptl, int *PS);
 void automaton_delete(automaton a);
-void automaton_dump(automaton a, char* filename);
+void automaton_dump  (automaton a, char* filename);
 
 #endif
diff --git a/wxwin/auxframes.cc b/wxwin/auxframes.cc
index a183051..0a1faa8 100644
--- a/wxwin/auxframes.cc
+++ b/wxwin/auxframes.cc
@@ -16,7 +16,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* $Id: auxframes.cc,v 1.7 2005/03/29 08:05:18 afrab Exp $ */
+/* $Id: auxframes.cc,v 1.8 2005/03/29 08:22:55 afrab Exp $ */
 
 #include <iostream>
 using namespace std;
@@ -32,6 +32,7 @@ using namespace std;
 
 #include "dic.h"
 #include "dic_search.h"
+#include "training.h"
 #include "game.h"
 
 #include "configdb.h"
@@ -383,9 +384,8 @@ BenjFrame::Refresh(refresh_t force)
     }
 
     Waiting();
-    // ANTOINE
-    //    Dic_search_Benj(m_game.getDic(),
-    //                    m_game.getSearchedWord(item).c_str(), wordlist);
+    Dic_search_Benj(m_game.getDic(),
+		    ((Training&)m_game).getSearchedWord(item).c_str(), wordlist);
 
     int resnum = 0;
     wxString res[RES_BENJ_MAX];
@@ -422,9 +422,8 @@ RaccFrame::Refresh(refresh_t force)
     }
 
     Waiting();
-    // ANTOINE
-    //    Dic_search_Racc(m_game.getDic(),
-    //                    m_game.getSearchedWord(item).c_str(), wordlist);
+    Dic_search_Racc(m_game.getDic(),
+		    ((Training&)m_game).getSearchedWord(item).c_str(), wordlist);
 
     int resnum = 0;
     wxString res[RES_RACC_MAX];