Tiny clean-ups.

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

diff --git a/src/frontends/xforms/RadioButtonGroup.C b/src/frontends/xforms/RadioButtonGroup.C
index e98b01f4adaa709615a3d536410b32d0d3ffeebe..7509b78378984e6af58bf8b5697dadd3a503d24a 100644 (file)
--- a/src/frontends/xforms/RadioButtonGroup.C
+++ b/src/frontends/xforms/RadioButtonGroup.C
@@ -1,33 +1,28 @@
 /**
  * \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.
  *
  * \author Baruch Even
  * \author Rob Lahaye
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "RadioButtonGroup.h"
-#include FORMS_H_LOCATION
 
-#include "support/LAssert.h"
-#include "debug.h" // for lyxerr
+#include "xforms_helpers.h"
+
+#include "debug.h"
+
 #include "support/lyxfunctional.h"
 
-#include <algorithm>
-#include <iterator>
+#include "lyx_forms.h"
+
+#include <boost/assert.hpp>
 
-using std::find_if;
 using std::endl;
 
 
@@ -35,21 +30,21 @@ void RadioButtonGroup::init(FL_OBJECT * ob, size_type value)
 {
        // Object must be a ROUND3DBUTTON (let all radio buttons look the same)
        // and of type RADIO_BUTTON (otherwise it ain't work).
-       lyx::Assert(ob && ob->objclass == FL_ROUND3DBUTTON
+       BOOST_ASSERT(ob && ob->objclass == FL_ROUND3DBUTTON
                        && ob->type == FL_RADIO_BUTTON);
 
        map.push_back(ButtonValuePair(ob, value));
 }
 
 
-void RadioButtonGroup::set(size_type value)
+void RadioButtonGroup::set(size_type value) const
 {
        ButtonValueMap::const_iterator it =
                find_if(map.begin(), map.end(),
                        lyx::equal_2nd_in_pair<ButtonValuePair>(value));
 
        if (it != map.end()) {
-               set(it->first);
+               fl_set_button(it->first, 1);
        } else {
                // We found nothing: report it and do nothing.
                lyxerr << "BUG: Requested value in RadioButtonGroup "
@@ -58,9 +53,22 @@ void RadioButtonGroup::set(size_type value)
 }
 
 
-void RadioButtonGroup::set(FL_OBJECT * ob)
+void RadioButtonGroup::set(FL_OBJECT * ob) const
 {
-       fl_set_button(ob, 1);
+       // Object must be member of the radiobutton group.
+       bool isMember = false;
+       ButtonValueMap::const_iterator it = map.begin();
+       for (; it != map.end() && !isMember; ++it) {
+               isMember = it->first == ob;
+       }
+
+       if (isMember) {
+               fl_set_button(ob, 1);
+       } else {
+               // Object is not a member; report it and do nothing.
+               lyxerr << "BUG: Requested object is not a member of "
+                       << "the RadioButtonGroup." << endl;
+       }
 }
 
 
@@ -73,6 +81,21 @@ struct is_set_button {
 };
 
 
+void RadioButtonGroup::unset() const
+{
+       // Find the active button.
+       ButtonValueMap::const_iterator it =
+               find_if(map.begin(), map.end(),
+                       is_set_button<ButtonValuePair> ());
+
+       if (it == map.end())
+               // Nothing to do. No button is set.
+               return;
+
+       fl_set_button(it->first, 0);
+}
+
+
 RadioButtonGroup::size_type RadioButtonGroup::get() const
 {
        // Find the active button.
@@ -87,3 +110,13 @@ RadioButtonGroup::size_type RadioButtonGroup::get() const
        lyxerr << "BUG: No active radio button found." << endl;
        return 0;
 }
+
+
+void RadioButtonGroup::setEnabled(bool enable)
+{
+       ButtonValueMap::iterator it  = map.begin();
+       ButtonValueMap::iterator end = map.end();
+       for (; it != end; ++it) {
+               ::setEnabled(it->first, enable);
+       }
+}