Bugfixes: checkboxes to radiobuttons (from J�rgen S) and remove a little

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

diff --git a/src/frontends/xforms/FormBaseDeprecated.C b/src/frontends/xforms/FormBaseDeprecated.C
index 1e9c294b5c1a422d9e9cb3f0867128f9fd310130..c020a59cb1e79f41919af04b64f00a8e677ded6a 100644 (file)
--- a/src/frontends/xforms/FormBaseDeprecated.C
+++ b/src/frontends/xforms/FormBaseDeprecated.C
@@ -26,29 +26,38 @@
 
 using SigC::slot;
 
-extern "C" int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
-{
-       return FormBaseDeprecated::WMHideCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::ApplyCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::OKCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::CancelCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::InputCB(ob, d);
-}
-extern "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
-{
-       FormBaseDeprecated::RestoreCB(ob, d);
+extern "C" {
+       
+       static
+       int C_FormBaseDeprecatedWMHideCB(FL_FORM * ob, void * d)
+       {
+               return FormBaseDeprecated::WMHideCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedApplyCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::ApplyCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedOKCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::OKCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedCancelCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::CancelCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedInputCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::InputCB(ob, d);
+       }
+
+       void C_FormBaseDeprecatedRestoreCB(FL_OBJECT * ob, long d)
+       {
+               FormBaseDeprecated::RestoreCB(ob, d);
+       }
 }
 
 
@@ -193,6 +202,13 @@ void FormBaseDeprecated::InputCB(FL_OBJECT * ob, long data)
        FormBaseDeprecated * pre =
                static_cast<FormBaseDeprecated*>(ob->form->u_vdata);
        lyx::Assert(pre);
+
+       // It is possible to set the choice to 0 when using the
+       // keyboard shortcuts. This work-around deals with the problem.
+       if (ob && ob->objclass == FL_CHOICE && fl_get_choice(ob) < 1) {
+               fl_set_choice(ob, 1);
+       }
+
        pre->bc().valid(pre->input(ob, data));
 }