From 8443d7123b860253fd9c4fe04285d6cb16417424 Mon Sep 17 00:00:00 2001 From: Dekel Tsur Date: Wed, 25 Sep 2002 07:58:48 +0000 Subject: [PATCH] floatflt has no "Inner" placement option. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5340 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/FormWrap.C | 8 ++++---- src/frontends/xforms/forms/form_wrap.fd | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 57183bb645..974422ee27 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2002-09-25 Dekel Tsur + + * forms/form_wrap.fd: floatflt has no "Inner" placement option. + The possible placements are default/outer/left/right. + 2002-09-24 Lars Gullik Bjønnes * Makefile.am (INCLUDES): loose SIGC_INCLUDES diff --git a/src/frontends/xforms/FormWrap.C b/src/frontends/xforms/FormWrap.C index 17f99ef5b7..2612f3bd42 100644 --- a/src/frontends/xforms/FormWrap.C +++ b/src/frontends/xforms/FormWrap.C @@ -54,7 +54,7 @@ void FormWrap::build() bc().addReadOnly(dialog_->choice_width_units); bc().addReadOnly(dialog_->radio_left); bc().addReadOnly(dialog_->radio_right); - bc().addReadOnly(dialog_->radio_inner); + bc().addReadOnly(dialog_->radio_outer); bc().addReadOnly(dialog_->radio_default); } @@ -69,7 +69,7 @@ void FormWrap::apply() controller().params().placement = "l"; else if (fl_get_button(dialog_->radio_right)) controller().params().placement = "r"; - else if (fl_get_button(dialog_->radio_inner)) + else if (fl_get_button(dialog_->radio_outer)) controller().params().placement = "p"; else controller().params().placement.erase(); @@ -87,7 +87,7 @@ void FormWrap::update() else if (controller().params().placement == "r") fl_set_button(dialog_->radio_right, 1); else if (controller().params().placement == "p") - fl_set_button(dialog_->radio_inner, 1); + fl_set_button(dialog_->radio_outer, 1); else fl_set_button(dialog_->radio_default, 1); } @@ -101,7 +101,7 @@ ButtonPolicy::SMInput FormWrap::input(FL_OBJECT * ob, long) if (ob == dialog_->radio_left || ob == dialog_->radio_right || - ob == dialog_->radio_inner || + ob == dialog_->radio_outer || ob == dialog_->radio_default || ob == dialog_->choice_width_units) return ButtonPolicy::SMI_VALID; diff --git a/src/frontends/xforms/forms/form_wrap.fd b/src/frontends/xforms/forms/form_wrap.fd index 132dcc2da2..b6c353cdef 100644 --- a/src/frontends/xforms/forms/form_wrap.fd +++ b/src/frontends/xforms/forms/form_wrap.fd @@ -166,11 +166,11 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Inner|#I +label: Outer|#O shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity -name: radio_inner +name: radio_outer callback: C_FormBaseInputCB argument: 0 -- 2.39.2