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

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

diff --git a/src/frontends/xforms/form_document.h b/src/frontends/xforms/form_document.h
index fd85e779ad7276783b620db57f2850d509615e8b..0f5551da3f5b6645875f8292377fa24862bc0260 100644 (file)
--- a/src/frontends/xforms/form_document.h
+++ b/src/frontends/xforms/form_document.h
@@ -5,20 +5,21 @@
 #define FD_form_tabbed_document_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedRestoreCB(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);
 
-extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
@@ -32,27 +33,37 @@ struct FD_form_tabbed_document {
        FL_OBJECT *button_ok;
        FL_OBJECT *text_warning;
        FL_OBJECT *button_restore;
+       FL_OBJECT *button_save_defaults;
+       FL_OBJECT *button_reset_defaults;
 };
 struct FD_form_doc_paper {
        ~FD_form_doc_paper();
 
        FL_FORM *form;
-       FL_OBJECT *choice_paperpackage;
-       FL_OBJECT *greoup_radio_orientation;
-       FL_OBJECT *radio_portrait;
-       FL_OBJECT *radio_landscape;
-       FL_OBJECT *choice_papersize2;
-       FL_OBJECT *push_use_geometry;
+       FL_OBJECT *choice_papersize;
        FL_OBJECT *input_custom_width;
+       FL_OBJECT *choice_custom_width_units;
        FL_OBJECT *input_custom_height;
+       FL_OBJECT *choice_custom_height_units;
+       FL_OBJECT *group_radio_orientation;
+       FL_OBJECT *radio_portrait;
+       FL_OBJECT *radio_landscape;
+       FL_OBJECT *check_use_geometry;
+       FL_OBJECT *choice_paperpackage;
        FL_OBJECT *input_top_margin;
+       FL_OBJECT *choice_top_margin_units;
        FL_OBJECT *input_bottom_margin;
-       FL_OBJECT *input_left_margin;
-       FL_OBJECT *input_right_margin;
+       FL_OBJECT *choice_bottom_margin_units;
+       FL_OBJECT *input_inner_margin;
+       FL_OBJECT *choice_inner_margin_units;
+       FL_OBJECT *input_outer_margin;
+       FL_OBJECT *choice_outer_margin_units;
        FL_OBJECT *input_head_height;
+       FL_OBJECT *choice_head_height_units;
        FL_OBJECT *input_head_sep;
+       FL_OBJECT *choice_head_sep_units;
        FL_OBJECT *input_foot_skip;
-       FL_OBJECT *text_warning;
+       FL_OBJECT *choice_foot_skip_units;
 };
 struct FD_form_doc_class {
        ~FD_form_doc_class();
@@ -76,6 +87,7 @@ struct FD_form_doc_class {
        FL_OBJECT *radio_doc_indent;
        FL_OBJECT *radio_doc_skip;
        FL_OBJECT *input_doc_spacing;
+       FL_OBJECT *choice_default_skip_units;
 };
 struct FD_form_doc_language {
        ~FD_form_doc_language();
@@ -96,6 +108,8 @@ struct FD_form_doc_options {
        FL_OBJECT *slider_tocdepth;
        FL_OBJECT *choice_postscript_driver;
        FL_OBJECT *check_use_amsmath;
+       FL_OBJECT *check_use_natbib;
+       FL_OBJECT *choice_citation_format;
 };
 struct FD_form_doc_bullet {
        ~FD_form_doc_bullet();