Re: jbrefort - r34971 - abiword/trunk/src/wp/ap/gtk

--=-6xWF68blKgwSXxM13vAy
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Right, Attached patch is for abiword-3.0. With it the modify style
dialog does not grow up to the screen width, and the delete combo shows
something since with current code it shows only empty lines (with recent
gtk+, I don't know what happens with earlier versions)

Cheers,
Jean

Le mardi 11 novembre 2014 =C3=A0 23:04 -0500, Hubert Figui=C3=A8re a =C3=A9=
crit :
> On 11/11/14 04:12 AM, [email protected] wrote:
> >=20
> > Author: jbrefort
> > Date: 2014-11-11 10:12:14 +0100 (Tue, 11 Nov 2014)
> > New Revision: 34971
> >=20
> > Modified:
> >    abiword/trunk/src/wp/ap/gtk/ap_UnixDialog_Styles.cpp
> > Log:
> > Fixed the style modify dialog. Please test and backport.
>=20
>=20
> Not sure what it fixes - so harder to test - but this surely conflicts
> with Gtk2 support as GtkGrid doesn't exists there.
> It is fine for trunk though.
>=20
>=20
> > @@ -919,9 +893,10 @@
> >  	gtk_widget_show (descriptionFrame);
> >  	gtk_box_pack_start (GTK_BOX (OverallVbox), descriptionFrame, FALSE,=
 FALSE, 0);
> > =20
> > -	DescriptionText =3D gtk_widget_new (GTK_TYPE_FRAME,
> > +	DescriptionText =3D gtk_widget_new (GTK_TYPE_LABEL,
> >  					  "xpad", 0, "ypad", 6,
> >  					  "wrap", TRUE,
> > +					  "max-width-chars", 64,
> >  					  NULL);
>=20
> Thank you for fixing this one. It was a typo / cut&paste error in one o=
f
> my previous patch (trunk only) trunk@34959
>=20
>=20
>=20
> Thanks,
>=20
> Hub


--=-6xWF68blKgwSXxM13vAy
Content-Disposition: attachment; filename="abi-3.0.patch"
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name="abi-3.0.patch"; charset="UTF-8"

SW5kZXg6IHNyYy93cC9hcC9ndGsvYXBfVW5peERpYWxvZ19TdHlsZXMuY3BwCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIHNyYy93cC9hcC9ndGsvYXBfVW5peERpYWxvZ19TdHlsZXMuY3BwCShyw6l2aXNpb24gMzQ5
NzIpCisrKyBzcmMvd3AvYXAvZ3RrL2FwX1VuaXhEaWFsb2dfU3R5bGVzLmNwcAkoY29waWUgZGUg
dHJhdmFpbCkKQEAgLTkzNSw2ICs5MzUsNyBAQAogCiAJRGVzY3JpcHRpb25UZXh0ID0gZ3RrX2xh
YmVsX25ldyAoTlVMTCk7CiAJZ3RrX21pc2Nfc2V0X3BhZGRpbmcoR1RLX01JU0MoRGVzY3JpcHRp
b25UZXh0KSwgMCwgNik7CisJZ3RrX2xhYmVsX3NldF9tYXhfd2lkdGhfY2hhcnMoR1RLX0xBQkVM
KERlc2NyaXB0aW9uVGV4dCksIDY0KTsKIAlndGtfd2lkZ2V0X3Nob3cgKERlc2NyaXB0aW9uVGV4
dCk7CiAJZ3RrX2NvbnRhaW5lcl9hZGQgKEdUS19DT05UQUlORVIgKGRlc2NyaXB0aW9uRnJhbWUp
LCBEZXNjcmlwdGlvblRleHQpOwogCWd0a19sYWJlbF9zZXRfbGluZV93cmFwIChHVEtfTEFCRUwg
KERlc2NyaXB0aW9uVGV4dCksIFRSVUUpOwpAQCAtOTU0LDYgKzk1NSw5IEBACiAKIAlHdGtMaXN0
U3RvcmUgKiBzdG9yZSA9IGd0a19saXN0X3N0b3JlX25ldygxLCBHX1RZUEVfU1RSSU5HKTsKIAlk
ZWxldGVQcm9wQ29tYm8gPSBndGtfY29tYm9fYm94X25ld193aXRoX21vZGVsX2FuZF9lbnRyeShH
VEtfVFJFRV9NT0RFTChzdG9yZSkpOworI2lmIEdUS19DSEVDS19WRVJTSU9OKDIsMjQsMCkKKwln
dGtfY29tYm9fYm94X3NldF9lbnRyeV90ZXh0X2NvbHVtbihHVEtfQ09NQk9fQk9YKGRlbGV0ZVBy
b3BDb21ibyksIDApOworI2VuZGlmCiAJZ3RrX3dpZGdldF9zaG93IChkZWxldGVQcm9wQ29tYm8p
OwogCWd0a19ib3hfcGFja19zdGFydCAoR1RLX0JPWCAoZGVsZXRlUm93KSwgZGVsZXRlUHJvcENv
bWJvLCBUUlVFLCBUUlVFLCAwKTsKIAo=


--=-6xWF68blKgwSXxM13vAy--