Introduce LFUN_PRINT.

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

diff --git a/src/frontends/xforms/FormBase.C b/src/frontends/xforms/FormBase.C
index aa75144166e9f4758de55ba774009a9e62d94d28..31836c0e681c47ecc67ce6fcfe61697689b39dfb 100644 (file)
--- a/src/frontends/xforms/FormBase.C
+++ b/src/frontends/xforms/FormBase.C
@@ -5,28 +5,32 @@
  *
  * \author Angus Leeming
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
 #include "FormBase.h"
 
-#include "ControlButtons.h"
-#include "xformsBC.h"
-#include "ButtonController.h"
-#include "xforms_resize.h"
 #include "Tooltips.h"
 #include "xforms_helpers.h" // formatted
+#include "xforms_resize.h"
+#include "xformsBC.h"
 
-#include "gettext.h"        // _()
-#include "support/BoostFormat.h"
+#include "controllers/ButtonController.h"
+#include "controllers/ControlButtons.h"
 
-#include "support/LAssert.h"
 #include "support/filetools.h" //  LibFileSearch
+#include "support/lstrings.h"
 
 #include "lyx_forms.h"
 
+using lyx::support::bformat;
+using lyx::support::LibFileSearch;
+
+using std::string;
+
+
 extern "C" {
 
 #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
@@ -50,7 +54,7 @@ FormBase::FormBase(string const & t, bool allowResize)
          warning_posted_(false), message_widget_(0),
          minw_(0), minh_(0), allow_resize_(allowResize),
          icon_pixmap_(0), icon_mask_(0),
-         tooltips_(new Tooltips())
+         tooltips_(new Tooltips)
 {}
 
 
@@ -123,7 +127,7 @@ void FormBase::show()
 {
        // build() is/should be called from the controller, so form() should
        // always exist.
-       lyx::Assert(form());
+       BOOST_ASSERT(form());
 
        // we use minw_ to flag whether the dialog has ever been shown.
        // In turn, prepare_to_show() initialises various bits 'n' pieces
@@ -182,14 +186,14 @@ void FormBase::hide()
 
 void FormBase::setPrehandler(FL_OBJECT * ob)
 {
-       lyx::Assert(ob);
+       BOOST_ASSERT(ob);
        fl_set_object_prehandler(ob, C_PrehandlerCB);
 }
 
 
 void FormBase::setMessageWidget(FL_OBJECT * ob)
 {
-       lyx::Assert(ob && ob->objclass == FL_TEXT);
+       BOOST_ASSERT(ob && ob->objclass == FL_TEXT);
        message_widget_ = ob;
        fl_set_object_lsize(message_widget_, FL_NORMAL_SIZE);
 }
@@ -216,7 +220,7 @@ ButtonPolicy::SMInput FormBase::input(FL_OBJECT *, long)
 // preemptive handler for feedback messages
 void FormBase::MessageCB(FL_OBJECT * ob, int event)
 {
-       lyx::Assert(ob);
+       BOOST_ASSERT(ob);
 
        switch (event) {
        case FL_ENTER:
@@ -243,7 +247,7 @@ void FormBase::MessageCB(FL_OBJECT * ob, int event)
 
 void FormBase::PrehandlerCB(FL_OBJECT * ob, int event, int key)
 {
-       lyx::Assert(ob);
+       BOOST_ASSERT(ob);
 
        if (ob->objclass == FL_INPUT && event == FL_PUSH && key == 2) {
                // Trigger an input event when pasting in an xforms input object
@@ -295,7 +299,7 @@ void FormBase::postWarning(string const & warning)
 
 void FormBase::clearMessage()
 {
-       lyx::Assert(message_widget_);
+       BOOST_ASSERT(message_widget_);
 
        warning_posted_ = false;
 
@@ -312,23 +316,14 @@ void FormBase::clearMessage()
 
 void FormBase::postMessage(string const & message)
 {
-       lyx::Assert(message_widget_);
+       BOOST_ASSERT(message_widget_);
 
        int const width = message_widget_->w - 10;
-#if USE_BOOST_FORMAT
-       boost::format fmter = warning_posted_ ?
-               boost::format(_("WARNING! %1$s")) :
-               boost::format("%1$s");
-
-       string const str = formatted(STRCONV(boost::io::str(fmter % message)),
-                                    width, FL_NORMAL_SIZE);
-#else
        string const tmp = warning_posted_ ?
-               _("WARNING!") + string(" ") + message :
+               bformat(_("WARNING! %1$s"), message) :
                message;
 
        string const str = formatted(tmp, width, FL_NORMAL_SIZE);
-#endif
 
        fl_set_object_label(message_widget_, str.c_str());
        FL_COLOR const label_color = warning_posted_ ? FL_RED : FL_LCOL;
@@ -343,7 +338,7 @@ namespace {
 
 FormBase * GetForm(FL_OBJECT * ob)
 {
-       lyx::Assert(ob && ob->form && ob->form->u_vdata);
+       BOOST_ASSERT(ob && ob->form && ob->form->u_vdata);
        FormBase * ptr = static_cast<FormBase *>(ob->form->u_vdata);
        return ptr;
 }
@@ -387,7 +382,7 @@ void C_FormBaseInputCB(FL_OBJECT * ob, long d)
 static int C_WMHideCB(FL_FORM * form, void *)
 {
        // Close the dialog cleanly, even if the WM is used to do so.
-       lyx::Assert(form && form->u_vdata);
+       BOOST_ASSERT(form && form->u_vdata);
        FormBase * ptr = static_cast<FormBase *>(form->u_vdata);
        ptr->getController().CancelButton();
        return FL_CANCEL;
@@ -398,11 +393,11 @@ static int C_PrehandlerCB(FL_OBJECT * ob, int event,
 {
        // Note that the return value is important in the pre-emptive handler.
        // Don't return anything other than 0.
-       lyx::Assert(ob);
+       BOOST_ASSERT(ob);
 
        // Don't Assert this one, as it can happen quite naturally when things
        // are being deleted in the d-tor.
-       //Assert(ob->form);
+       //BOOST_ASSERT(ob->form);
        if (!ob->form) return 0;
 
        FormBase * ptr = static_cast<FormBase *>(ob->form->u_vdata);