summaryrefslogtreecommitdiff
path: root/riscos/wimp_event.c
diff options
context:
space:
mode:
Diffstat (limited to 'riscos/wimp_event.c')
-rw-r--r--riscos/wimp_event.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c
index d048b9a1e..d42d2b08a 100644
--- a/riscos/wimp_event.c
+++ b/riscos/wimp_event.c
@@ -634,7 +634,6 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer)
int current, step, stepping, min, max, decimal_places;
wimp_window_state open;
wimp_caret caret;
- os_error *error;
bool prepared;
w = pointer->w;
@@ -702,6 +701,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer)
* button, then close the menu (which closes us) and then finally
* re-open ourselves. ugh! */
if (current_menu != NULL) {
+ os_error *error;
open.w = pointer->w;
error = xwimp_get_window_state(&open);
if (error) {
@@ -1163,25 +1163,25 @@ bool ro_gui_wimp_event_pointer_entering_window(wimp_entering *entering)
bool ro_gui_wimp_event_process_window_menu_click(wimp_pointer *pointer)
{
struct event_window *window;
- int xpos, ypos, line_height, gap_height, entry;
window = ro_gui_wimp_event_find_window(pointer->w);
if ((window) && (window->window_menu)
&& (pointer->buttons == wimp_CLICK_MENU)) {
+ int xpos, ypos;
+
if (window->menu_prepare)
if (!window->menu_prepare(window->w, wimp_ICON_WINDOW,
window->window_menu, pointer))
return false;
if (window->window_menu_iconbar) {
- xpos = pointer->pos.x;
- ypos = 96;
-
- line_height = window->window_menu->height +
+ int entry = 0;
+ int line_height = window->window_menu->height +
window->window_menu->gap;
- gap_height = 24; /* The fixed dotted line height */
+ int gap_height = 24; /* The fixed dotted line height */
- entry = 0;
+ xpos = pointer->pos.x;
+ ypos = 96;
do {
ypos += line_height;
if ((window->window_menu->
@@ -1340,7 +1340,6 @@ bool ro_gui_wimp_event_register_checkbox(wimp_w w, wimp_i i)
bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i)
{
struct event_window *window;
- struct icon_event *event;
window = ro_gui_wimp_event_get_window(w);
if (!window)
@@ -1348,7 +1347,8 @@ bool ro_gui_wimp_event_register_radio(wimp_w w, wimp_i *i)
window->max_radio_group++;
while (*i != -1) {
- event = ro_gui_wimp_event_get_event(w, *i, EVENT_RADIO);
+ struct icon_event *event = ro_gui_wimp_event_get_event(w, *i,
+ EVENT_RADIO);
if (!event)
return false;
event->data.radio_group = window->max_radio_group;