anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix update() of GTK wrap dialog for default placement

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13252 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Spray 2006-02-17 01:39:07 +00:00
parent c822a28e39
commit dfaf9a11a1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/frontends/gtk/ChangeLog
View File

@ -5,6 +5,7 @@
needed by some dialogs. More investigation needed.
* GTableCreate.C: Fix rows and columns being switched
* GMenubar.C: Escape underscores in menu labels
* GWrap.C: Cope with empty placement string for default placement
2006-02-14 John Spray <spray@lyx.org>
* GPainter.[Ch], xftFontMetrics.C: Remove broken multibyte

8
src/frontends/gtk/GWrap.C
View File

@ -73,6 +73,8 @@ void GWrap::update()
item = 2;
else if (params.placement == "p")
item = 3;
else
item = 0; // default
placementcombo_->set_active (item);
@ -87,11 +89,11 @@ void GWrap::apply()
if (applylock_)
return;
InsetWrapParams & params = controller().params();
InsetWrapParams & params = controller().params();
params.width = widthlengthentry_->get_length();
params.width = widthlengthentry_->get_length();
int const placementrow = placementcombo_->get_active_row_number();
int const placementrow = placementcombo_->get_active_row_number();
BOOST_ASSERT (0 <= placementrow <= 3);
switch (placementrow) {
case 1: