diff options
| author | Fred Pierresteguy | 1994-03-14 17:07:06 +0000 |
|---|---|---|
| committer | Fred Pierresteguy | 1994-03-14 17:07:06 +0000 |
| commit | e14e13a4cdb8990bfceecb61b52f4a635c35eb60 (patch) | |
| tree | 2324cbcbbe624097139dfc5fc30741e1203db230 | |
| parent | 15ba97a047472b9b6056f41425ffebad8fdbb430 (diff) | |
| download | emacs-e14e13a4cdb8990bfceecb61b52f4a635c35eb60.tar.gz emacs-e14e13a4cdb8990bfceecb61b52f4a635c35eb60.zip | |
*** empty log message ***
| -rw-r--r-- | lwlib/lwlib-Xaw.c | 73 | ||||
| -rw-r--r-- | lwlib/lwlib.c | 3 |
2 files changed, 55 insertions, 21 deletions
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c index 3f115679169..efc287e062a 100644 --- a/lwlib/lwlib-Xaw.c +++ b/lwlib/lwlib-Xaw.c | |||
| @@ -39,15 +39,18 @@ static void xaw_generic_callback (Widget, XtPointer, XtPointer); | |||
| 39 | 39 | ||
| 40 | 40 | ||
| 41 | Boolean | 41 | Boolean |
| 42 | lw_xaw_widget_p (Widget widget) | 42 | lw_xaw_widget_p (widget) |
| 43 | Widget widget; | ||
| 43 | { | 44 | { |
| 44 | return (XtIsSubclass (widget, scrollbarWidgetClass) || | 45 | return (XtIsSubclass (widget, scrollbarWidgetClass) || |
| 45 | XtIsSubclass (widget, dialogWidgetClass)); | 46 | XtIsSubclass (widget, dialogWidgetClass)); |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | static void | 49 | static void |
| 49 | xaw_update_scrollbar (widget_instance *instance, Widget widget, | 50 | xaw_update_scrollbar (instance, widget, val) |
| 50 | widget_value *val) | 51 | widget_instance *instance; |
| 52 | Widget widget; | ||
| 53 | widget_value *val; | ||
| 51 | { | 54 | { |
| 52 | #if 0 | 55 | #if 0 |
| 53 | if (val->scrollbar_data) | 56 | if (val->scrollbar_data) |
| @@ -109,8 +112,11 @@ xaw_update_scrollbar (widget_instance *instance, Widget widget, | |||
| 109 | } | 112 | } |
| 110 | 113 | ||
| 111 | void | 114 | void |
| 112 | xaw_update_one_widget (widget_instance *instance, Widget widget, | 115 | xaw_update_one_widget (instance, widget, val, deep_p) |
| 113 | widget_value *val, Boolean deep_p) | 116 | widget_instance *instance; |
| 117 | Widget widget; | ||
| 118 | widget_value *val; | ||
| 119 | Boolean deep_p; | ||
| 114 | { | 120 | { |
| 115 | if (XtIsSubclass (widget, scrollbarWidgetClass)) | 121 | if (XtIsSubclass (widget, scrollbarWidgetClass)) |
| 116 | { | 122 | { |
| @@ -146,8 +152,10 @@ xaw_update_one_widget (widget_instance *instance, Widget widget, | |||
| 146 | } | 152 | } |
| 147 | 153 | ||
| 148 | void | 154 | void |
| 149 | xaw_update_one_value (widget_instance *instance, Widget widget, | 155 | xaw_update_one_value (instance, widget, val) |
| 150 | widget_value *val) | 156 | widget_instance *instance; |
| 157 | Widget widget; | ||
| 158 | widget_value *val; | ||
| 151 | { | 159 | { |
| 152 | /* This function is not used by the scrollbars and those are the only | 160 | /* This function is not used by the scrollbars and those are the only |
| 153 | Athena widget implemented at the moment so do nothing. */ | 161 | Athena widget implemented at the moment so do nothing. */ |
| @@ -155,7 +163,8 @@ xaw_update_one_value (widget_instance *instance, Widget widget, | |||
| 155 | } | 163 | } |
| 156 | 164 | ||
| 157 | void | 165 | void |
| 158 | xaw_destroy_instance (widget_instance *instance) | 166 | xaw_destroy_instance (instance) |
| 167 | widget_instance *instance; | ||
| 159 | { | 168 | { |
| 160 | if (XtIsSubclass (instance->widget, dialogWidgetClass)) | 169 | if (XtIsSubclass (instance->widget, dialogWidgetClass)) |
| 161 | /* Need to destroy the Shell too. */ | 170 | /* Need to destroy the Shell too. */ |
| @@ -165,14 +174,17 @@ xaw_destroy_instance (widget_instance *instance) | |||
| 165 | } | 174 | } |
| 166 | 175 | ||
| 167 | void | 176 | void |
| 168 | xaw_popup_menu (Widget widget) | 177 | xaw_popup_menu (widget) |
| 178 | Widget widget; | ||
| 169 | { | 179 | { |
| 170 | /* An Athena menubar has not been implemented. */ | 180 | /* An Athena menubar has not been implemented. */ |
| 171 | return; | 181 | return; |
| 172 | } | 182 | } |
| 173 | 183 | ||
| 174 | void | 184 | void |
| 175 | xaw_pop_instance (widget_instance *instance, Boolean up) | 185 | xaw_pop_instance (instance, up) |
| 186 | widget_instance *instance; | ||
| 187 | Boolean up; | ||
| 176 | { | 188 | { |
| 177 | Widget widget = instance->widget; | 189 | Widget widget = instance->widget; |
| 178 | 190 | ||
| @@ -240,10 +252,17 @@ static XtActionsRec xaw_actions [] = { | |||
| 240 | static Boolean actions_initted = False; | 252 | static Boolean actions_initted = False; |
| 241 | 253 | ||
| 242 | static Widget | 254 | static Widget |
| 243 | make_dialog (char* name, Widget parent, Boolean pop_up_p, | 255 | make_dialog (name, parent, pop_up_p, shell_title, icon_name, text_input_slot, radio_box, list, left_buttons, right_buttons) |
| 244 | char* shell_title, char* icon_name, Boolean text_input_slot, | 256 | char* name; |
| 245 | Boolean radio_box, Boolean list, | 257 | Widget parent; |
| 246 | int left_buttons, int right_buttons) | 258 | Boolean pop_up_p; |
| 259 | char* shell_title; | ||
| 260 | char* icon_name; | ||
| 261 | Boolean text_input_slot; | ||
| 262 | Boolean radio_box; | ||
| 263 | Boolean list; | ||
| 264 | int left_buttons; | ||
| 265 | int right_buttons; | ||
| 247 | { | 266 | { |
| 248 | Arg av [20]; | 267 | Arg av [20]; |
| 249 | int ac = 0; | 268 | int ac = 0; |
| @@ -341,7 +360,8 @@ make_dialog (char* name, Widget parent, Boolean pop_up_p, | |||
| 341 | } | 360 | } |
| 342 | 361 | ||
| 343 | Widget | 362 | Widget |
| 344 | xaw_create_dialog (widget_instance* instance) | 363 | xaw_create_dialog (instance) |
| 364 | widget_instance* instance; | ||
| 345 | { | 365 | { |
| 346 | char *name = instance->info->type; | 366 | char *name = instance->info->type; |
| 347 | Widget parent = instance->parent; | 367 | Widget parent = instance->parent; |
| @@ -406,7 +426,10 @@ xaw_create_dialog (widget_instance* instance) | |||
| 406 | 426 | ||
| 407 | 427 | ||
| 408 | static void | 428 | static void |
| 409 | xaw_generic_callback (Widget widget, XtPointer closure, XtPointer call_data) | 429 | xaw_generic_callback (widget, closure, call_data) |
| 430 | Widget widget; | ||
| 431 | XtPointer closure; | ||
| 432 | XtPointer call_data; | ||
| 410 | { | 433 | { |
| 411 | widget_instance *instance = (widget_instance *) closure; | 434 | widget_instance *instance = (widget_instance *) closure; |
| 412 | Widget instance_widget; | 435 | Widget instance_widget; |
| @@ -452,7 +475,10 @@ xaw_generic_callback (Widget widget, XtPointer closure, XtPointer call_data) | |||
| 452 | } | 475 | } |
| 453 | 476 | ||
| 454 | static void | 477 | static void |
| 455 | wm_delete_window (Widget shell, XtPointer closure, XtPointer call_data) | 478 | wm_delete_window (shell, closure, call_data) |
| 479 | Widget shell; | ||
| 480 | XtPointer closure; | ||
| 481 | XtPointer call_data; | ||
| 456 | { | 482 | { |
| 457 | LWLIB_ID id; | 483 | LWLIB_ID id; |
| 458 | Widget *kids = 0; | 484 | Widget *kids = 0; |
| @@ -482,7 +508,10 @@ wm_delete_window (Widget shell, XtPointer closure, XtPointer call_data) | |||
| 482 | /* Scrollbars */ | 508 | /* Scrollbars */ |
| 483 | 509 | ||
| 484 | static void | 510 | static void |
| 485 | xaw_scrollbar_scroll (Widget widget, XtPointer closure, XtPointer call_data) | 511 | xaw_scrollbar_scroll (widget, closure, call_data) |
| 512 | Widget widget; | ||
| 513 | XtPointer closure; | ||
| 514 | XtPointer call_data; | ||
| 486 | { | 515 | { |
| 487 | #if 0 | 516 | #if 0 |
| 488 | widget_instance *instance = (widget_instance *) closure; | 517 | widget_instance *instance = (widget_instance *) closure; |
| @@ -507,7 +536,10 @@ xaw_scrollbar_scroll (Widget widget, XtPointer closure, XtPointer call_data) | |||
| 507 | } | 536 | } |
| 508 | 537 | ||
| 509 | static void | 538 | static void |
| 510 | xaw_scrollbar_jump (Widget widget, XtPointer closure, XtPointer call_data) | 539 | xaw_scrollbar_jump (widget, closure, call_data) |
| 540 | Widget widget; | ||
| 541 | XtPointer closure; | ||
| 542 | XtPointer call_data; | ||
| 511 | { | 543 | { |
| 512 | #if 0 | 544 | #if 0 |
| 513 | widget_instance *instance = (widget_instance *) closure; | 545 | widget_instance *instance = (widget_instance *) closure; |
| @@ -535,7 +567,8 @@ xaw_scrollbar_jump (Widget widget, XtPointer closure, XtPointer call_data) | |||
| 535 | } | 567 | } |
| 536 | 568 | ||
| 537 | static Widget | 569 | static Widget |
| 538 | xaw_create_scrollbar (widget_instance *instance) | 570 | xaw_create_scrollbar (instance) |
| 571 | widget_instance *instance; | ||
| 539 | { | 572 | { |
| 540 | #if 0 | 573 | #if 0 |
| 541 | Arg av[20]; | 574 | Arg av[20]; |
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c index ec83a3f5cb6..4e7e807f80d 100644 --- a/lwlib/lwlib.c +++ b/lwlib/lwlib.c | |||
| @@ -331,7 +331,8 @@ get_widget_info (id, remove_p) | |||
| 331 | /* Internal function used by the library dependent implementation to get the | 331 | /* Internal function used by the library dependent implementation to get the |
| 332 | widget_value for a given widget in an instance */ | 332 | widget_value for a given widget in an instance */ |
| 333 | widget_info * | 333 | widget_info * |
| 334 | lw_get_widget_info (LWLIB_ID id) | 334 | lw_get_widget_info (id) |
| 335 | LWLIB_ID id; | ||
| 335 | { | 336 | { |
| 336 | return get_widget_info (id, 0); | 337 | return get_widget_info (id, 0); |
| 337 | } | 338 | } |