mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-03-05 23:01:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix OS3 build

Browse Source 
Fix font cache on OS3
This commit is contained in:
Chris Young 2015-01-29 19:31:47 +00:00
parent 0e3cbbb67b
commit e5b6dac87c
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
amiga/font.c
View File

@ -370,7 +370,6 @@ static struct ami_font_node *ami_font_open(const char *font)
struct nsObject *node; struct nsObject *node;
struct ami_font_node *nodedata; struct ami_font_node *nodedata;
#ifdef __amigaos4__
node = (struct nsObject *)FindIName((struct List *)ami_font_list, font); node = (struct nsObject *)FindIName((struct List *)ami_font_list, font);
if(node) if(node)
{ {
@ -378,9 +377,6 @@ static struct ami_font_node *ami_font_open(const char *font)
GetSysTime(&nodedata->lastused); GetSysTime(&nodedata->lastused);
return nodedata; return nodedata;
} }
#else
#warning FIXME: font cache won't work on OS3
#endif
LOG(("Font cache miss: %s", font)); LOG(("Font cache miss: %s", font));

2
amiga/gui.c
View File

@ -3589,7 +3589,7 @@ gui_window_create(struct browser_window *bw,
iconifygadget = TRUE; iconifygadget = TRUE;
ami_create_menu(g->shared); ami_create_menu(g->shared);
#ifndef __amigaos4__ #ifndef __amigaos4__
struct Menu *menu = ami_menu_create_os3(g->shared->menu); struct Menu *menu = ami_menu_create_os3(g->shared, g->shared->menu);
#endif #endif
NewList(&g->shared->tab_list); NewList(&g->shared->tab_list);
g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"), g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"),

2
amiga/gui.h
View File

@ -131,7 +131,7 @@ struct gui_window_2 {
struct MinList shared_pens; struct MinList shared_pens;
gui_pointer_shape mouse_pointer; gui_pointer_shape mouse_pointer;
#ifndef __amigaos4__ #ifndef __amigaos4__
struct NewMenu *menu; struct NewMenu *menu_os3;
struct VisualInfo *vi; struct VisualInfo *vi;
#endif #endif
}; };

4
amiga/menu.c
View File

@ -338,7 +338,7 @@ void ami_menu_refresh(struct gui_window_2 *gwin)
ami_free_menulabs(gwin); ami_free_menulabs(gwin);
ami_create_menu(gwin); ami_create_menu(gwin);
#ifndef __amigaos4__ #ifndef __amigaos4__
gwin->menu_os3 = ami_menu_create_os3(gwin->menu); gwin->menu_os3 = ami_menu_create_os3(gwin, gwin->menu);
#endif #endif
SetAttrs(gwin->objects[OID_MAIN], SetAttrs(gwin->objects[OID_MAIN],
@ -552,7 +552,7 @@ struct Menu *ami_menu_create_os3(struct gui_window_2 *gwin, struct NewMenu *newm
{ {
gwin->vi = GetVisualInfo(scrn, TAG_DONE); gwin->vi = GetVisualInfo(scrn, TAG_DONE);
gwin->menu_os3 = CreateMenus(newmenu, TAG_DONE); gwin->menu_os3 = CreateMenus(newmenu, TAG_DONE);
LayoutMenus(menu, vi, TAG_DONE); LayoutMenus(gwin->menu_os3, gwin->vi, TAG_DONE);
return gwin->menu_os3; return gwin->menu_os3;
} }
#endif #endif

1
amiga/os3support.h
View File

@ -141,6 +141,7 @@
/* Exec */ /* Exec */
#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */ #define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */
#define FindIName FindName
#define GetPred(N) (N)->ln_Pred #define GetPred(N) (N)->ln_Pred
#define GetSucc(N) (N)->ln_Succ #define GetSucc(N) (N)->ln_Succ