try this for distinguishing inner and outer tabs

[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 ab59e23360cc62f0c9e8f9f0dc5d86c9ed981364..d8e25ee9a5e5a8d587e237ff4328774b9512d3dd 100644 (file)
--- a/src/frontends/xforms/form_tabular.h
+++ b/src/frontends/xforms/form_tabular.h
@@ -5,19 +5,15 @@
 #define FD_form_tabular_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormTabularCloseCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormTabularInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormTabularInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormTabularInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormTabularInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormTabularOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormTabularApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormTabularCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
@@ -55,20 +51,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_column_width;
+       FL_OBJECT *input_special_alignment;
 };
 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;
@@ -79,7 +71,11 @@ 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;
 };
 struct FD_form_longtable_options {
        ~FD_form_longtable_options();
@@ -91,15 +87,5 @@ struct FD_form_longtable_options {
        FL_OBJECT *radio_lt_lastfoot;
        FL_OBJECT *radio_lt_newpage;
 };
-struct FD_form_create_tabular {
-       ~FD_form_create_tabular();
-
-       FL_FORM *form;
-       FL_OBJECT *button_ok;
-       FL_OBJECT *button_apply;
-       FL_OBJECT *button_cancel;
-       FL_OBJECT *slider_columns;
-       FL_OBJECT *slider_rows;
-};
 
 #endif /* FD_form_tabular_h_ */