More pref work from Angus

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

diff --git a/src/frontends/xforms/form_paragraph.h b/src/frontends/xforms/form_paragraph.h
index a0e6d857dd37185cb15e8b46a83df22fcf9f8799..37b7830c0dc31cc0d76e7006e141776be8c7a9ca 100644 (file)
--- a/src/frontends/xforms/form_paragraph.h
+++ b/src/frontends/xforms/form_paragraph.h
@@ -5,15 +5,14 @@
 #define FD_form_paragraph_general_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_FormBaseInputCB(FL_OBJECT *, long);
 
-extern  "C" void C_FormParagraphInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseInputCB(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_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);
 
 
 /**** Forms and Objects ****/
@@ -49,7 +48,6 @@ struct FD_form_paragraph_extra {
        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;
@@ -66,6 +64,7 @@ struct FD_form_tabbed_paragraph {
        FL_OBJECT *button_apply;
        FL_OBJECT *button_ok;
        FL_OBJECT *button_restore;
+       FL_OBJECT *text_warning;
 };
 
 #endif /* FD_form_paragraph_general_h_ */