X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2Fform_paragraph.h;h=d4c4819ae97103206136e0485c7748dd7fe70c92;hb=3e39bef2c13125023f3b72532d90575bbe307335;hp=a0e6d857dd37185cb15e8b46a83df22fcf9f8799;hpb=e1cd54a1a23175d6ef84dd00609c96ed1470438c;p=lyx.git

diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h
index a0e6d857dd..d4c4819ae9 100644
--- a/src/frontends/xforms/form_paragraph.h
+++ b/src/frontends/xforms/form_paragraph.h
@@ -1,71 +1,47 @@
 // File modified by fdfix.sh for use by lyx (with xforms >= 0.88) and gettext
 /** Header file generated with fdesign **/
 
-#ifndef FD_form_paragraph_general_h_
-#define FD_form_paragraph_general_h_
+#ifndef FD_form_paragraph_h_
+#define FD_form_paragraph_h_
 
 /** Callbacks, globals and object handlers **/
-extern  "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphVSpaceCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
-
-extern  "C" void C_FormParagraphCancelCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphApplyCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphOKCB(FL_OBJECT *, long);
-extern  "C" void C_FormParagraphRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
-struct FD_form_paragraph_general {
-	~FD_form_paragraph_general();
+struct FD_form_paragraph {
+	~FD_form_paragraph();
 
 	FL_FORM *form;
-	FL_OBJECT *input_labelwidth;
-	FL_OBJECT *check_lines_top;
-	FL_OBJECT *check_lines_bottom;
-	FL_OBJECT *check_pagebreaks_top;
-	FL_OBJECT *check_pagebreaks_bottom;
-	FL_OBJECT *check_noindent;
-	FL_OBJECT *group_radio_alignment;
 	FL_OBJECT *radio_align_right;
 	FL_OBJECT *radio_align_left;
 	FL_OBJECT *radio_align_block;
 	FL_OBJECT *radio_align_center;
-	FL_OBJECT *input_space_above;
-	FL_OBJECT *input_space_below;
+	FL_OBJECT *check_lines_top;
+	FL_OBJECT *check_lines_bottom;
+	FL_OBJECT *check_pagebreaks_top;
+	FL_OBJECT *check_pagebreaks_bottom;
 	FL_OBJECT *choice_space_above;
-	FL_OBJECT *choice_space_below;
+	FL_OBJECT *input_space_above;
 	FL_OBJECT *check_space_above;
+	FL_OBJECT *choice_space_below;
+	FL_OBJECT *input_space_below;
 	FL_OBJECT *check_space_below;
-};
-struct FD_form_paragraph_extra {
-	~FD_form_paragraph_extra();
-
-	FL_FORM *form;
-	FL_OBJECT *input_pextra_width;
-	FL_OBJECT *input_pextra_widthp;
-	FL_OBJECT *group_alignment;
-	FL_OBJECT *radio_pextra_top;
-	FL_OBJECT *radio_pextra_middle;
-	FL_OBJECT *radio_pextra_bottom;
-	FL_OBJECT *text_warning;
-	FL_OBJECT *radio_pextra_hfill;
-	FL_OBJECT *radio_pextra_startmp;
-	FL_OBJECT *group_extraopt;
-	FL_OBJECT *radio_pextra_indent;
-	FL_OBJECT *radio_pextra_minipage;
-	FL_OBJECT *radio_pextra_floatflt;
-};
-struct FD_form_tabbed_paragraph {
-	~FD_form_tabbed_paragraph();
-
-	FL_FORM *form;
-	FL_OBJECT *tabbed_folder;
-	FL_OBJECT *button_cancel;
-	FL_OBJECT *button_apply;
-	FL_OBJECT *button_ok;
+	FL_OBJECT *choice_linespacing;
+	FL_OBJECT *input_linespacing;
+	FL_OBJECT *input_labelwidth;
+	FL_OBJECT *check_noindent;
 	FL_OBJECT *button_restore;
+	FL_OBJECT *button_ok;
+	FL_OBJECT *button_apply;
+	FL_OBJECT *button_close;
+	FL_OBJECT *text_warning;
+	FL_OBJECT *choice_value_space_above;
+	FL_OBJECT *choice_value_space_below;
 };
 
-#endif /* FD_form_paragraph_general_h_ */
+#endif /* FD_form_paragraph_h_ */