remove defaults stuff, let Qt handle no toolbar

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

diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index de09cc38e3df6ba6beadd941909b02ea350f4653..707dfb013fc312539223e0aabca6caffdc4bda33 100644 (file)
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -12,9 +12,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "FormMathsBitmap.h"
 #include "ControlMath.h"
@@ -91,14 +88,15 @@ void FormMathsBitmap::build()
 
        fl_add_box(FL_UP_BOX, 0, 0, w_, h_, "");
 
-       x_ = 0;
-       y_ = 0;
+       x_ = y_ = ww_;
+       y_ += 8;
+
        int y_close = 0;
        for (vector<BitmapStore>::const_iterator it = bitmaps_.begin();
             it < bitmaps_.end(); ++it) {
                FL_OBJECT * obj = buildBitmap(*it);
 
-               bc().addReadOnly(obj);
+               bcview().addReadOnly(obj);
                y_close = max(y_close, obj->y + obj->h);
        }
        bitmaps_.clear();
@@ -107,9 +105,8 @@ void FormMathsBitmap::build()
        y_ = y_close + 10;
 
        char const * const label = _("Close|^[");
-       fdui->button_close =
-               fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30,
-                             idex(label).c_str());
+       fdui->button_close = fl_add_button(FL_NORMAL_BUTTON, x_, y_, 90, 30,
+                                          idex(label).c_str());
        fl_set_button_shortcut(fdui->button_close, scex(label).c_str(), 1);
        fl_set_object_lsize(fdui->button_close, FL_NORMAL_SIZE);
        fl_set_object_callback(fdui->button_close, C_FormBaseCancelCB, 0);
@@ -119,7 +116,7 @@ void FormMathsBitmap::build()
        fdui->form->fdui = fdui;
 
        dialog_.reset(fdui);
-       bc().setCancel(dialog_->button_close);
+       bcview().setCancel(dialog_->button_close);
 }