remove defaults stuff, let Qt handle no toolbar

[lyx.git] / src / frontends / xforms / FormGraphics.C

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index 60749e7c1f576096a5b35d027491ef53925ec8a8..32bd0e2011ec351a246e8f6c4c957d67505fd23e 100644 (file)
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -12,9 +12,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "xformsBC.h"
 #include "ControlGraphics.h"
@@ -39,7 +36,7 @@
 #include "support/lyxlib.h"  // for float_equal
 #include "support/filetools.h"  // for MakeAbsPath etc
 
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include FORMS_H_LOCATION
 
@@ -58,10 +55,10 @@ string defaultUnit("cm");
 } // namespace anon
 
 
-typedef FormCB<ControlGraphics, FormDB<FD_graphics> > base_class;
+typedef FormController<ControlGraphics, FormView<FD_graphics> > base_class;
 
-FormGraphics::FormGraphics()
-       : base_class(_("Graphics"), false)
+FormGraphics::FormGraphics(Dialog & parent)
+       : base_class(parent, _("Graphics"), false)
 {}
 
 
@@ -82,23 +79,23 @@ void FormGraphics::build()
        dialog_.reset(build_graphics(this));
 
        // Manage the ok, apply, restore and cancel/close buttons
-       bc().setOK(dialog_->button_ok);
-       bc().setApply(dialog_->button_apply);
-       bc().setCancel(dialog_->button_close);
-       bc().setRestore(dialog_->button_restore);
+       bcview().setOK(dialog_->button_ok);
+       bcview().setApply(dialog_->button_apply);
+       bcview().setCancel(dialog_->button_close);
+       bcview().setRestore(dialog_->button_restore);
 
        // the file section
        file_.reset(build_graphics_file(this));
 
        // disable for read-only documents
-       bc().addReadOnly(file_->button_browse);
-       bc().addReadOnly(file_->check_aspectratio);
-       bc().addReadOnly(file_->check_draft);
-       bc().addReadOnly(file_->check_nounzip);
+       bcview().addReadOnly(file_->button_browse);
+       bcview().addReadOnly(file_->check_aspectratio);
+       bcview().addReadOnly(file_->check_draft);
+       bcview().addReadOnly(file_->check_nounzip);
 
        // check validity of "length + unit" input
-       addCheckedGlueLength(bc(), file_->input_width);
-       addCheckedGlueLength(bc(), file_->input_height);
+       addCheckedGlueLength(bcview(), file_->input_width);
+       addCheckedGlueLength(bcview(), file_->input_height);
 
        // trigger an input event for cut&paste with middle mouse button.
        setPrehandler(file_->input_filename);
@@ -169,11 +166,11 @@ void FormGraphics::build()
        bbox_.reset(build_graphics_bbox(this));
 
        // disable for read-only documents
-       bc().addReadOnly(bbox_->button_getBB);
-       bc().addReadOnly(bbox_->check_clip);
+       bcview().addReadOnly(bbox_->button_getBB);
+       bcview().addReadOnly(bbox_->check_clip);
 
        // check validity of "length + unit" input
-       addCheckedLyXLength(bc(), bbox_->input_bb_x1, bbox_->text_X);
+       addCheckedLyXLength(bcview(), bbox_->input_bb_x1, bbox_->text_X);
 
        // trigger an input event for cut&paste with middle mouse button.
        setPrehandler(bbox_->input_bb_x0);
@@ -220,10 +217,10 @@ void FormGraphics::build()
        extra_.reset(build_graphics_extra(this));
 
        // disable for read-only documents
-       bc().addReadOnly(extra_->input_rotate_angle);
-       bc().addReadOnly(extra_->choice_origin);
-       bc().addReadOnly(extra_->check_subcaption);
-       bc().addReadOnly(extra_->input_special);
+       bcview().addReadOnly(extra_->input_rotate_angle);
+       bcview().addReadOnly(extra_->choice_origin);
+       bcview().addReadOnly(extra_->check_subcaption);
+       bcview().addReadOnly(extra_->input_special);
 
        // trigger an input event for cut&paste with middle mouse button.
        setPrehandler(extra_->input_rotate_angle);