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

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

diff --git a/src/frontends/xforms/form_graphics.h b/src/frontends/xforms/form_graphics.h
index 1e4701b8ca7a6b42b8df4b21151ebb69bef456af..a4c9c55318e83d3581f4454d39ce418e1ccd6a20 100644 (file)
--- a/src/frontends/xforms/form_graphics.h
+++ b/src/frontends/xforms/form_graphics.h
@@ -5,11 +5,11 @@
 #define FD_form_graphics_h_
 
 /** Callbacks, globals and object handlers **/
-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);
+extern  "C" void C_FormBaseInputCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseRestoreCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseOKCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseApplyCB(FL_OBJECT *, long);
+extern  "C" void C_FormBaseCancelCB(FL_OBJECT *, long);
 
 
 /**** Forms and Objects ****/
@@ -20,27 +20,14 @@ struct FD_form_graphics {
        FL_OBJECT *input_filename;
        FL_OBJECT *button_browse;
        FL_OBJECT *input_width;
+       FL_OBJECT *choice_width_units;
        FL_OBJECT *input_height;
-       FL_OBJECT *radio_button_group_width;
-       FL_OBJECT *radio_width_percent_page;
-       FL_OBJECT *radio_width_default;
-       FL_OBJECT *radio_width_cm;
-       FL_OBJECT *radio_width_inch;
-       FL_OBJECT *radio_width_percent_column;
-       FL_OBJECT *radio_button_group_height;
-       FL_OBJECT *radio_height_percent_page;
-       FL_OBJECT *radio_height_inch;
-       FL_OBJECT *radio_height_cm;
-       FL_OBJECT *radio_height_default;
-       FL_OBJECT *radio_button_group_display;
-       FL_OBJECT *radio_display_monochrome;
-       FL_OBJECT *radio_display_grayscale;
-       FL_OBJECT *radio_display_color;
-       FL_OBJECT *radio_no_display;
+       FL_OBJECT *choice_height_units;
+       FL_OBJECT *input_scale;
        FL_OBJECT *input_rotate_angle;
-       FL_OBJECT *check_inline;
-       FL_OBJECT *input_subcaption;
+       FL_OBJECT *check_display;
        FL_OBJECT *check_subcaption;
+       FL_OBJECT *input_subcaption;
        FL_OBJECT *button_restore;
        FL_OBJECT *button_ok;
        FL_OBJECT *button_apply;