*
* \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 "controllers/ButtonController.h"
+#include "controllers/ControlButtons.h"
-#include "support/lstrings.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)
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)
{}
{
// 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
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);
}
// preemptive handler for feedback messages
void FormBase::MessageCB(FL_OBJECT * ob, int event)
{
- lyx::Assert(ob);
+ BOOST_ASSERT(ob);
switch (event) {
case FL_ENTER:
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
void FormBase::clearMessage()
{
- lyx::Assert(message_widget_);
+ BOOST_ASSERT(message_widget_);
warning_posted_ = false;
void FormBase::postMessage(string const & message)
{
- lyx::Assert(message_widget_);
+ BOOST_ASSERT(message_widget_);
int const width = message_widget_->w - 10;
-
string const tmp = warning_posted_ ?
bformat(_("WARNING! %1$s"), message) :
message;
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;
}
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;
{
// 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);