diff options
Diffstat (limited to 'riscos/treeview.c')
-rw-r--r-- | riscos/treeview.c | 71 |
1 files changed, 24 insertions, 47 deletions
diff --git a/riscos/treeview.c b/riscos/treeview.c index 39c601413..aa86d209c 100644 --- a/riscos/treeview.c +++ b/riscos/treeview.c @@ -311,8 +311,7 @@ void ro_treeview_redraw_request(int x, int y, int width, int height, error = xwimp_update_window(&update, &more); if (error) { - LOG(("xwimp_update_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_update_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -334,8 +333,7 @@ void ro_treeview_redraw(wimp_draw *redraw) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(redraw->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) redraw->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)redraw->w); /* Don't return, as not servicing redraw events isn't a good * idea. The following code must handle (tv == NULL) * gracefully while clearing the redraw queue. @@ -344,8 +342,7 @@ void ro_treeview_redraw(wimp_draw *redraw) error = xwimp_redraw_window(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -411,8 +408,7 @@ void ro_treeview_scroll(wimp_scroll *scroll) error = xwimp_open_window((wimp_open *) scroll); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); } } @@ -460,8 +456,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more) error = xwimp_get_rectangle(redraw, &more); if (error) { - LOG(("xwimp_redraw_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_redraw_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -514,8 +509,7 @@ void ro_treeview_scroll_visible(int y, int height, void *pw) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -553,8 +547,7 @@ void ro_treeview_scroll_visible(int y, int height, void *pw) error = xwimp_open_window((wimp_open *) &state); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -581,8 +574,7 @@ void ro_treeview_get_window_dimensions(int *width, int *height, state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -624,8 +616,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -684,8 +675,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) error = xwimp_open_window((wimp_open *) &state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -709,8 +699,7 @@ void ro_treeview_set_window_extent(ro_treeview *tv, int width, int height) error = xwimp_set_extent(tv->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -735,8 +724,7 @@ static void ro_treeview_open(wimp_open *open) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(open->w); if (tv == NULL) { - LOG(("NULL treeview block for window: ox%x", - (unsigned int) open->w)); + LOG("NULL treeview block for window: ox%x", (unsigned int)open->w); return; } @@ -764,8 +752,7 @@ static void ro_treeview_open(wimp_open *open) error = xwimp_set_extent(tv->w, &extent); if (error) { - LOG(("xwimp_set_extent: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_set_extent: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -778,8 +765,7 @@ static void ro_treeview_open(wimp_open *open) error = xwimp_open_window(open); if (error) { - LOG(("xwimp_open_window: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_open_window: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -806,16 +792,14 @@ static bool ro_treeview_mouse_click(wimp_pointer *pointer) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(pointer->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) pointer->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)pointer->w); return false; } state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return false; } @@ -939,8 +923,7 @@ void ro_treeview_mouse_at(wimp_pointer *pointer, void *data) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(pointer->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) pointer->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)pointer->w); return; } @@ -954,8 +937,7 @@ void ro_treeview_mouse_at(wimp_pointer *pointer, void *data) state.w = tv->w; error = xwimp_get_window_state(&state); if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_get_window_state: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); return; } @@ -1034,13 +1016,12 @@ static void ro_treeview_drag_start(ro_treeview *tv, wimp_pointer *pointer, break; } - LOG(("Drag start...")); + LOG("Drag start..."); error = xwimp_drag_box_with_flags(&drag, wimp_DRAG_BOX_KEEP_IN_LINE | wimp_DRAG_BOX_CLIP); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } else { auto_scroll.w = tv->w; @@ -1055,8 +1036,7 @@ static void ro_treeview_drag_start(ro_treeview *tv, wimp_pointer *pointer, error = xwimp_auto_scroll(wimp_AUTO_SCROLL_ENABLE_VERTICAL, &auto_scroll, NULL); if (error) { - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } @@ -1080,15 +1060,13 @@ static void ro_treeview_drag_end(wimp_dragged *drag, void *data) error = xwimp_drag_box((wimp_drag *) -1); if (error) { - LOG(("xwimp_drag_box: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_drag_box: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } error = xwimp_auto_scroll(0, NULL, NULL); if (error) { - LOG(("xwimp_auto_scroll: 0x%x: %s", - error->errnum, error->errmess)); + LOG("xwimp_auto_scroll: 0x%x: %s", error->errnum, error->errmess); warn_user("WimpError", error->errmess); } } @@ -1108,8 +1086,7 @@ static bool ro_treeview_keypress(wimp_key *key) tv = (ro_treeview *) ro_gui_wimp_event_get_user_data(key->w); if (tv == NULL) { - LOG(("NULL treeview block for window: 0x%x", - (unsigned int) key->w)); + LOG("NULL treeview block for window: 0x%x", (unsigned int)key->w); return false; } |