diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-10-24 20:29:10 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-10-24 20:29:10 +0000 |
| commit | 8b610cfc7cc2daf6715e60d033c82d118f97f04b (patch) | |
| tree | 9b1951547f258159a3d7a4d4ced627f705a3bb47 | |
| parent | d13506289a58f3895531d38240ab5401244237e6 (diff) | |
| download | vim-git-8b610cfc7cc2daf6715e60d033c82d118f97f04b.tar.gz | |
updated for version 7.0-152v7.0.152
| -rw-r--r-- | src/gui_xmebw.c | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c index 8ae3d40c4..be218d178 100644 --- a/src/gui_xmebw.c +++ b/src/gui_xmebw.c @@ -138,6 +138,19 @@ static XtResource resources[] = } }; +/* This is needed to work around a bug in Lesstif 2, leaving the extension + * NULL somehow results in getting it set to an invalid pointer. */ +XmPrimitiveClassExtRec xmEnhancedButtonPrimClassExtRec = +{ + /* next_extension */ NULL, + /* record_type */ NULLQUARK, + /* version */ XmPrimitiveClassExtVersion, + /* record_size */ sizeof(XmPrimitiveClassExtRec), + /* widget_baseline */ XmInheritBaselineProc, + /* widget_display_rect */ XmInheritDisplayRectProc, + /* widget_margins */ NULL +}; + XmEnhancedButtonClassRec xmEnhancedButtonClassRec = { { @@ -184,7 +197,7 @@ XmEnhancedButtonClassRec xmEnhancedButtonClassRec = /* arm and activate */ XmInheritArmAndActivate, /* synthetic resources */ NULL, /* number of syn res */ 0, - /* extension */ NULL, + /* extension */ (XtPointer)&xmEnhancedButtonPrimClassExtRec, }, /* label_class fields */ diff --git a/src/version.c b/src/version.c index c73040be7..ea55ad36b 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 152, +/**/ 151, /**/ 150, |