Aggiunta regexp a ricerca in viswin

git-svn-id: svn://10.65.10.50/trunk@2983 c028cbd2-c16b-5b4b-a496-9718f37d4682

include/bagn005.uml

@@ -1,7 +1,7 @@
 /* Maschera ricerca per viswin */
 #include "bagn005.h"
 
-PAGE "Cerca testo" -1 -1 60 5
+PAGE "Cerca testo" -1 -1 60 6
 
 STRING F_STRING 70 45
 BEGIN
@@ -17,12 +17,12 @@ END
 
 BOOLEAN F_CASE
 BEGIN
-  PROMPT 2 2 "Maiuscolo/Minuscolo"
+  PROMPT 12 3 "Maiuscole/Minuscole"
 END
 
 BOOLEAN F_REGEXP
 BEGIN
-  PROMPT 36 2 "Espress. regolare"
+  PROMPT 36 3 "Espress. regolare"
 END
 
 BUTTON DLG_OK 10 2

include/viswin.cpp

@@ -2407,6 +2407,7 @@ void TViswin::find()
   m.set(F_STRING, _txt_to_find);
   m.set(F_DIRECT, _down_dir ? "D" : "U");
   m.set(F_CASE,   _case_sensitive ? "X" : "");
+  m.set(F_REGEXP, _regexp ? "X" : "");
   
   if (m.run() == K_ENTER)
   {
@@ -2499,7 +2500,7 @@ TViswin::TViswin(const char *fname,
                  _multiple (FALSE), _rulers(rulers), _txt_to_find(64),
                  _frozen (FALSE), _brwfld(brwfld), _link_button(NULL), _print_button(NULL),
                  _down_dir(TRUE), _showbuts(FALSE), _case_sensitive(FALSE),
-                 _menu_present(FALSE)
+                 _menu_present(FALSE), _regexp(FALSE)
 {
   begin_wait();
 

include/viswin.h

@@ -113,6 +113,8 @@ class TViswin : public TScroll_window
   bool _down_dir;
   // @cmember:(INTERNAL) Indica se si deve fare una ricerca case sensitive
   bool _case_sensitive;
+  // @cmember:(INTERNAL) Memorizza lo stato del flag "espressione regolare" nella fin. di search
+  bool _regexp;                                                              
                                                                 
   // @cmember:(INTERNAL) Lunghezza della pagina
   int _formlen;