mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Another wimp_window_state->wimp_open conversion. 

Avoid aliasing an int ** and a void **.

svn path=/trunk/netsurf/; revision=6946
This commit is contained in:
John Mark Bell 2009-03-27 17:54:33 +00:00
parent a6e0dfe800
commit fbec0d96c9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
riscos/wimp_event.c
View File

@ -36,6 +36,7 @@
#include "riscos/ucstables.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
#include "riscos/wimputils.h"
#include "utils/log.h"
#include "utils/utils.h"
@ -528,7 +529,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer)
pointer->w);
ro_gui_menu_closed(false);
gui_poll(true);
error = xwimp_open_window((wimp_open *) &open);
error = xwimp_open_window(PTR_WIMP_OPEN(&open));
if (error) {
LOG(("xwimp_open_window: 0x%x: %s",
error->errnum, error->errmess));
@ -718,22 +719,25 @@ bool ro_gui_wimp_event_keypress(wimp_key *key)
}
if (t_alphabet != alphabet) {
void *ostable;
osbool unclaimed;
/* Alphabet has changed, so read UCS table location */
alphabet = t_alphabet;
error = xserviceinternational_get_ucs_conversion_table(
alphabet, &unclaimed,
(void**)&ucstable);
if (error) {
alphabet, &unclaimed, &ostable);
if (error != NULL) {
LOG(("failed reading UCS conversion table: 0x%x: %s",
error->errnum, error->errmess));
/* try using our own table instead */
/* Try using our own table instead */
ucstable = ucstable_from_alphabet(alphabet);
}
if (unclaimed)
} else if (unclaimed) {
/* Service wasn't claimed so use our own ucstable */
ucstable = ucstable_from_alphabet(alphabet);
} else {
/* Use the table provided by the OS */
ucstable = ostable;
}
}
if (c < 256) {