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

[lyx.git] / src / frontends / xforms / form_tabular.h

diff --git a/src/frontends/xforms/form_tabular.h b/src/frontends/xforms/form_tabular.h
index b888f02f7eda5a38146805707e81daca0754a67c..ca056ba46c945a49ab9ee80b1c5ab272d6b2b802 100644 (file)
--- a/src/frontends/xforms/form_tabular.h
+++ b/src/frontends/xforms/form_tabular.h
@@ -5,15 +5,15 @@
 #define FD_form_tabular_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
@@ -44,6 +44,7 @@ struct FD_form_column_options {
        ~FD_form_column_options();
 
        FL_FORM *form;
+       FL_OBJECT *input_column_width;
        FL_OBJECT *radio_border_top;
        FL_OBJECT *radio_border_bottom;
        FL_OBJECT *radio_border_left;
@@ -51,20 +52,16 @@ struct FD_form_column_options {
        FL_OBJECT *radio_align_left;
        FL_OBJECT *radio_align_right;
        FL_OBJECT *radio_align_center;
-       FL_OBJECT *input_column_width;
-       FL_OBJECT *input_special_alignment;
        FL_OBJECT *radio_valign_top;
        FL_OBJECT *radio_valign_center;
        FL_OBJECT *radio_valign_bottom;
+       FL_OBJECT *input_special_alignment;
+       FL_OBJECT *choice_value_column_width;
 };
 struct FD_form_cell_options {
        ~FD_form_cell_options();
 
        FL_FORM *form;
-       FL_OBJECT *radio_multicolumn;
-       FL_OBJECT *radio_rotate_cell;
-       FL_OBJECT *input_special_multialign;
-       FL_OBJECT *input_mcolumn_width;
        FL_OBJECT *radio_border_top;
        FL_OBJECT *radio_border_bottom;
        FL_OBJECT *radio_border_left;
@@ -75,7 +72,12 @@ struct FD_form_cell_options {
        FL_OBJECT *radio_valign_top;
        FL_OBJECT *radio_valign_center;
        FL_OBJECT *radio_valign_bottom;
+       FL_OBJECT *input_mcolumn_width;
+       FL_OBJECT *input_special_multialign;
+       FL_OBJECT *radio_multicolumn;
        FL_OBJECT *radio_useminipage;
+       FL_OBJECT *radio_rotate_cell;
+       FL_OBJECT *choice_value_mcolumn_width;
 };
 struct FD_form_longtable_options {
        ~FD_form_longtable_options();
@@ -86,6 +88,16 @@ struct FD_form_longtable_options {
        FL_OBJECT *radio_lt_foot;
        FL_OBJECT *radio_lt_lastfoot;
        FL_OBJECT *radio_lt_newpage;
+       FL_OBJECT *check_head_2border_above;
+       FL_OBJECT *check_head_2border_below;
+       FL_OBJECT *check_1head_2border_above;
+       FL_OBJECT *check_foot_2border_above;
+       FL_OBJECT *check_lastfoot_2border_above;
+       FL_OBJECT *check_1head_2border_below;
+       FL_OBJECT *check_foot_2border_below;
+       FL_OBJECT *check_lastfoot_2border_below;
+       FL_OBJECT *check_1head_empty;
+       FL_OBJECT *check_lastfoot_empty;
 };
 
 #endif /* FD_form_tabular_h_ */