]>
Commit | Line | Data |
---|---|---|
5ee5dc07 AM |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.0.014 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.0.014 | |
11 | Problem: Compiling gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe) | |
12 | Solution: Disable some code for Motif 1.2 and older. | |
13 | Files: src/gui_xmebw.c | |
14 | ||
15 | ||
16 | *** ../vim-7.0.013/src/gui_xmebw.c Wed May 10 15:22:49 2006 | |
17 | --- src/gui_xmebw.c Thu May 11 19:09:32 2006 | |
18 | *************** | |
19 | *** 480,486 **** | |
20 | || (eb->core.height <= 2 * eb->primitive.highlight_thickness)) | |
21 | return; | |
22 | ||
23 | ! #ifndef LESSTIF_VERSION | |
24 | { | |
25 | XmDisplay dpy; | |
26 | ||
27 | --- 480,486 ---- | |
28 | || (eb->core.height <= 2 * eb->primitive.highlight_thickness)) | |
29 | return; | |
30 | ||
31 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
32 | { | |
33 | XmDisplay dpy; | |
34 | ||
35 | *************** | |
36 | *** 641,647 **** | |
37 | GC tmp_gc = NULL; | |
38 | Boolean replaceGC = False; | |
39 | Boolean deadjusted = False; | |
40 | ! #ifndef LESSTIF_VERSION | |
41 | XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); | |
42 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
43 | #else | |
44 | --- 641,647 ---- | |
45 | GC tmp_gc = NULL; | |
46 | Boolean replaceGC = False; | |
47 | Boolean deadjusted = False; | |
48 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
49 | XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); | |
50 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
51 | #else | |
52 | *************** | |
53 | *** 726,732 **** | |
54 | if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) | |
55 | && _XmGetInDragMode((Widget) eb)) | |
56 | { | |
57 | ! #ifndef LESSTIF_VERSION | |
58 | XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); | |
59 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
60 | #else | |
61 | --- 726,732 ---- | |
62 | if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up) | |
63 | && _XmGetInDragMode((Widget) eb)) | |
64 | { | |
65 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
66 | XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); | |
67 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
68 | #else | |
69 | *************** | |
70 | *** 810,816 **** | |
71 | ||
72 | if (Lab_IsMenupane(eb)) | |
73 | { | |
74 | ! #ifndef LESSTIF_VERSION | |
75 | XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); | |
76 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
77 | #else | |
78 | --- 810,816 ---- | |
79 | ||
80 | if (Lab_IsMenupane(eb)) | |
81 | { | |
82 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
83 | XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid)); | |
84 | Boolean etched_in = dpy->display.enable_etched_in_menu; | |
85 | #else | |
86 | *************** | |
87 | *** 1150,1156 **** | |
88 | Redisplay(Widget w, XEvent *event, Region region) | |
89 | { | |
90 | XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; | |
91 | ! #ifndef LESSTIF_VERSION | |
92 | XmDisplay dpy; | |
93 | XtEnum default_button_emphasis; | |
94 | #endif | |
95 | --- 1150,1156 ---- | |
96 | Redisplay(Widget w, XEvent *event, Region region) | |
97 | { | |
98 | XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w; | |
99 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
100 | XmDisplay dpy; | |
101 | XtEnum default_button_emphasis; | |
102 | #endif | |
103 | *************** | |
104 | *** 1162,1168 **** | |
105 | if (!XtIsRealized((Widget)eb)) | |
106 | return; | |
107 | ||
108 | ! #ifndef LESSTIF_VERSION | |
109 | dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); | |
110 | default_button_emphasis = dpy->display.default_button_emphasis; | |
111 | #endif | |
112 | --- 1162,1168 ---- | |
113 | if (!XtIsRealized((Widget)eb)) | |
114 | return; | |
115 | ||
116 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
117 | dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb)); | |
118 | default_button_emphasis = dpy->display.default_button_emphasis; | |
119 | #endif | |
120 | *************** | |
121 | *** 1241,1247 **** | |
122 | { | |
123 | int adjust = 0; | |
124 | ||
125 | ! #ifndef LESSTIF_VERSION | |
126 | /* | |
127 | * NOTE: PushButton has two types of shadows: primitive-shadow and | |
128 | * default-button-shadow. If pushbutton is in a menu only primitive | |
129 | --- 1241,1247 ---- | |
130 | { | |
131 | int adjust = 0; | |
132 | ||
133 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
134 | /* | |
135 | * NOTE: PushButton has two types of shadows: primitive-shadow and | |
136 | * default-button-shadow. If pushbutton is in a menu only primitive | |
137 | *************** | |
138 | *** 1289,1295 **** | |
139 | adjust, adjust, rectwidth, rectheight, borderwidth); | |
140 | } | |
141 | ||
142 | ! #ifndef LESSTIF_VERSION | |
143 | switch (default_button_emphasis) | |
144 | { | |
145 | case XmINTERNAL_HIGHLIGHT: | |
146 | --- 1289,1295 ---- | |
147 | adjust, adjust, rectwidth, rectheight, borderwidth); | |
148 | } | |
149 | ||
150 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
151 | switch (default_button_emphasis) | |
152 | { | |
153 | case XmINTERNAL_HIGHLIGHT: | |
154 | *************** | |
155 | *** 1365,1371 **** | |
156 | default_button_shadow_thickness = | |
157 | eb->pushbutton.default_button_shadow_thickness; | |
158 | ||
159 | ! #ifndef LESSTIF_VERSION | |
160 | /* | |
161 | * Compute location of bounding box to contain the | |
162 | * defaultButtonShadow. | |
163 | --- 1365,1371 ---- | |
164 | default_button_shadow_thickness = | |
165 | eb->pushbutton.default_button_shadow_thickness; | |
166 | ||
167 | ! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002) | |
168 | /* | |
169 | * Compute location of bounding box to contain the | |
170 | * defaultButtonShadow. | |
171 | *** ../vim-7.0.013/src/version.c Fri May 12 19:10:03 2006 | |
172 | --- src/version.c Fri May 12 19:23:12 2006 | |
173 | *************** | |
174 | *** 668,669 **** | |
175 | --- 668,671 ---- | |
176 | { /* Add new patch number below this line */ | |
177 | + /**/ | |
178 | + 14, | |
179 | /**/ | |
180 | ||
181 | -- | |
182 | hundred-and-one symptoms of being an internet addict: | |
183 | 126. You brag to all of your friends about your date Saturday night...but | |
184 | you don't tell them it was only in a chat room. | |
185 | ||
186 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
187 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
188 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
189 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |