Commit 8cecc3c5 authored by Kaleb Keithley Keithley's avatar Kaleb Keithley Keithley
Browse files

merge latest (4.3.99.16) from XFree86 (vendor) branch

parent 3e9f89c7
...@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization ...@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group. from The Open Group.
*/ */
/* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.6 2001/12/26 21:39:34 paulo Exp $ */ /* $XFree86: xc/programs/bitmap/BitEdit.c,v 1.7 2003/05/27 22:26:55 tsi Exp $ */
/* /*
* Author: Davor Matic, MIT X Consortium * Author: Davor Matic, MIT X Consortium
...@@ -215,8 +215,8 @@ static Widget ...@@ -215,8 +215,8 @@ static Widget
top_widget, top_widget,
parent_widget, parent_widget,
formy_widget, formy_widget,
fileButton_widget, fileMenu_widget, fileMenu_widget,
editButton_widget, editMenu_widget, editMenu_widget,
status_widget, status_widget,
pane_widget, pane_widget,
form_widget, form_widget,
...@@ -1014,9 +1014,10 @@ int main(int argc, char *argv[]) ...@@ -1014,9 +1014,10 @@ int main(int argc, char *argv[])
simpleMenuWidgetClass, simpleMenuWidgetClass,
formy_widget, NULL, 0); formy_widget, NULL, 0);
fileButton_widget = XtCreateManagedWidget("fileButton", (void) XtCreateManagedWidget("fileButton",
menuButtonWidgetClass, menuButtonWidgetClass,
formy_widget, NULL, 0); formy_widget, NULL, 0);
for (i = 0; i < XtNumber(file_menu); i++) { for (i = 0; i < XtNumber(file_menu); i++) {
w = XtCreateManagedWidget(file_menu[i].name, w = XtCreateManagedWidget(file_menu[i].name,
(file_menu[i].trap ? (file_menu[i].trap ?
...@@ -1034,9 +1035,9 @@ int main(int argc, char *argv[]) ...@@ -1034,9 +1035,9 @@ int main(int argc, char *argv[])
simpleMenuWidgetClass, simpleMenuWidgetClass,
formy_widget, NULL, 0); formy_widget, NULL, 0);
editButton_widget = XtCreateManagedWidget("editButton", (void) XtCreateManagedWidget("editButton",
menuButtonWidgetClass, menuButtonWidgetClass,
formy_widget, NULL, 0); formy_widget, NULL, 0);
for (i = 0; i < XtNumber(edit_menu); i++) { for (i = 0; i < XtNumber(edit_menu); i++) {
w = XtCreateManagedWidget(edit_menu[i].name, w = XtCreateManagedWidget(edit_menu[i].name,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment