Yet more dialog tweaking from Rob.

[lyx.git] / src / frontends / xforms / RadioButtonGroup.C

diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index 403b19c1459f87e9456b87c7b6e69772d86022a0..19e350c5f88deb00ad8f0772c29f7ccabd64793c 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -1,34 +1,39 @@
-/* This file is part of
- * =================================================
- * 
- *          LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich.
- *          Copyright 1995-2001 The LyX Team.
+/**
+ * \file RadioButtonGroup.C
+ * Copyright 1995 Matthias Ettrich.
+ * Copyright 2000 Baruch Even
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *          This file Copyright 2000 Baruch Even
- * ================================================= */
+ * \author Baruch Even
+ *
+ * Full author contact details are available in file CREDITS
+ */
 
-#include <config.h> 
-
-#include <functional>
-#include <algorithm>
-#include <iterator>
+#include <config.h>
 
 #ifdef __GNUG__
 #pragma implementation
-#endif 
+#endif
 
 #include "RadioButtonGroup.h"
+#include FORMS_H_LOCATION
 
 #include "debug.h" // for lyxerr
+#include "support/lyxfunctional.h"
+
+//#include <functional>
+#include <algorithm>
+#include <iterator>
 
 using std::find_if;
-using std::bind2nd;
+//using std::bind2nd;
 using std::endl;
 
-void RadioButtonGroup::registerRadioButton(FL_OBJECT *button, int value)
+
+void RadioButtonGroup::init(FL_OBJECT *button, size_type value)
 {
-       map.push_back( ButtonValuePair(button, value) );
+       map.push_back(ButtonValuePair(button, value));
 }
 
 
@@ -37,64 +42,44 @@ void RadioButtonGroup::reset()
        map.clear();
 }
 
-// Functor to help us in our work, we should try to find how to achieve
-// this with only STL predicates, but its easier to write this than to
-// dig. If you can find the equivalent STL predicate combination, let me
-// know.
-//
-// The idea is to take a pair and a value and return true when the second
-// element in the pair equals the value.
-template < typename T >
-struct equal_to_second_in_pair
-{
-       typedef bool result_type;
-       typedef T       first_argument_type;
-       typedef typename T::second_type second_argument_type;
-
-       bool operator() (
-           pair < typename T::first_type, typename T::second_type > const & left,
-           typename T::second_type const & right) const
-       {
-               return left.second == right;
-       }
-};
 
-void RadioButtonGroup::setButton(int value)
+void RadioButtonGroup::set(size_type value)
 {
        ButtonValueMap::const_iterator it =
-           find_if(map.begin(), map.end(),
-                   bind2nd(equal_to_second_in_pair < ButtonValuePair > (),
-                           value));
+               find_if(map.begin(), map.end(),
+                       lyx::equal_2nd_in_pair<ButtonValuePair>(value));
 
        // If we found nothing, report it and return
        if (it == map.end()) {
                lyxerr << "BUG: Requested value in RadioButtonGroup doesn't exists"
-               << endl;
+                      << endl;
        }
        else {
-               fl_set_button((*it).first, 1);
+               fl_set_button(it->first, 1);
        }
 
 }
 
+
 template < typename T >
 struct is_set_button {
        bool operator() (T const & item) const
        {
-               return fl_get_button( (item).first );
+               return fl_get_button((item).first);
        }
 };
 
-int RadioButtonGroup::getButton()
+
+RadioButtonGroup::size_type RadioButtonGroup::get() const
 {
        // Find the first button that is active
-       ButtonValueMap::iterator it =
-           find_if(map.begin(), map.end(),
-                   is_set_button < ButtonValuePair > () );
+       ButtonValueMap::const_iterator it =
+               find_if(map.begin(), map.end(),
+                       is_set_button<ButtonValuePair> ());
 
        // If such a button was found, return its value.
        if (it != map.end()) {
-               return (*it).second;
+               return it->second;
        }
 
        lyxerr << "BUG: No radio button found to be active." << endl;
@@ -102,4 +87,3 @@ int RadioButtonGroup::getButton()
        // Else return 0.
        return 0;
 }
-