diff --git a/riscos/wimp.c b/riscos/wimp.c index f738dbc87..6307844de 100644 --- a/riscos/wimp.c +++ b/riscos/wimp.c @@ -699,57 +699,6 @@ os_error *ro_gui_wimp_get_sprite(const char *name, osspriteop_header **sprite) } -/** - * Open a window as a pane in another window. - * - * \param parent parent window - * \param pane pane to open in parent window - * \param offset inset of pane from parent - */ - -void ro_gui_open_pane(wimp_w parent, wimp_w pane, int offset) -{ - wimp_window_state state; - os_error *error; - - state.w = parent; - error = xwimp_get_window_state(&state); - if (error) { - LOG(("xwimp_get_window_state: 0x%x: %s", - error->errnum, error->errmess)); - warn_user("WimpError", error->errmess); - return; - } - state.w = pane; - state.visible.x0 += offset; - state.visible.x1 -= offset; - state.visible.y0 += offset; - state.visible.y1 -= offset; - state.xscroll = 0; - state.yscroll = 0; - state.next = wimp_TOP; - error = xwimp_open_window_nested((wimp_open *) &state, parent, - wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT - << wimp_CHILD_XORIGIN_SHIFT | - wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT - << wimp_CHILD_YORIGIN_SHIFT | - wimp_CHILD_LINKS_PARENT_VISIBLE_BOTTOM_OR_LEFT - << wimp_CHILD_LS_EDGE_SHIFT | - wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT - << wimp_CHILD_BS_EDGE_SHIFT | - wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT - << wimp_CHILD_RS_EDGE_SHIFT | - wimp_CHILD_LINKS_PARENT_VISIBLE_TOP_OR_RIGHT - << wimp_CHILD_TS_EDGE_SHIFT); - if (error) { - LOG(("xwimp_open_window_nested: 0x%x: %s", - error->errnum, error->errmess)); - warn_user("WimpError", error->errmess); - return; - } -} - - /** * Performs simple user redraw for a window. * diff --git a/riscos/wimp.h b/riscos/wimp.h index 8a93f03f5..04a97d9de 100644 --- a/riscos/wimp.h +++ b/riscos/wimp.h @@ -50,7 +50,6 @@ void ro_gui_open_window_centre(wimp_w parent, wimp_w child); osspriteop_area *ro_gui_load_sprite_file(const char *pathname); bool ro_gui_wimp_sprite_exists(const char *sprite); os_error *ro_gui_wimp_get_sprite(const char *name, osspriteop_header **sprite); -void ro_gui_open_pane(wimp_w parent, wimp_w pane, int offset); wimp_w ro_gui_set_window_background_colour(wimp_w window, wimp_colour background);