summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-06-02 21:38:06 +0000
committerJames Bursa <james@netsurf-browser.org>2004-06-02 21:38:06 +0000
commitf28b24d30644b112601602563cc7a35277d132c4 (patch)
treee94d55b6f62480c7f1bb562272325f651d7b7b1d
parent6710971eec1a569a63ab51008bf07d29a430b667 (diff)
downloadnetsurf-f28b24d30644b112601602563cc7a35277d132c4.tar.gz
netsurf-f28b24d30644b112601602563cc7a35277d132c4.tar.bz2
[project @ 2004-06-02 21:38:06 by bursa]
Remove frames-related code. svn path=/import/netsurf/; revision=923
-rw-r--r--riscos/htmlinstance.c34
1 files changed, 3 insertions, 31 deletions
diff --git a/riscos/htmlinstance.c b/riscos/htmlinstance.c
index 68c03fdeb..ca239ddc8 100644
--- a/riscos/htmlinstance.c
+++ b/riscos/htmlinstance.c
@@ -10,7 +10,6 @@
#include "netsurf/desktop/browser.h"
#include "netsurf/render/box.h"
#include "netsurf/render/html.h"
-#include "netsurf/riscos/frames.h"
#include "netsurf/utils/log.h"
void html_add_instance(struct content *c, struct browser_window *bw,
@@ -21,16 +20,7 @@ void html_add_instance(struct content *c, struct browser_window *bw,
for (i = 0; i != c->data.html.object_count; i++) {
if (c->data.html.object[i].content == 0)
continue;
-#ifdef WITH_FRAMES
- if (c->data.html.object[i].content->type == CONTENT_HTML)
- frame_add_instance(c->data.html.object[i].content,
- bw, c,
- c->data.html.object[i].box,
- c->data.html.object[i].box->object_params,
- &c->data.html.object[i].box->object_state);
- else
-#endif
- content_add_instance(c->data.html.object[i].content,
+ content_add_instance(c->data.html.object[i].content,
bw, c,
c->data.html.object[i].box,
c->data.html.object[i].box->object_params,
@@ -47,16 +37,7 @@ void html_reshape_instance(struct content *c, struct browser_window *bw,
for (i = 0; i != c->data.html.object_count; i++) {
if (c->data.html.object[i].content == 0)
continue;
-#ifdef WITH_FRAMES
- if (c->data.html.object[i].content->type == CONTENT_HTML)
- frame_reshape_instance(c->data.html.object[i].content,
- bw, c,
- c->data.html.object[i].box,
- c->data.html.object[i].box->object_params,
- &c->data.html.object[i].box->object_state);
- else
-#endif
- content_reshape_instance(c->data.html.object[i].content,
+ content_reshape_instance(c->data.html.object[i].content,
bw, c,
c->data.html.object[i].box,
c->data.html.object[i].box->object_params,
@@ -72,16 +53,7 @@ void html_remove_instance(struct content *c, struct browser_window *bw,
for (i = 0; i != c->data.html.object_count; i++) {
if (c->data.html.object[i].content == 0)
continue;
-#ifdef WITH_FRAMES
- if (c->data.html.object[i].content->type == CONTENT_HTML)
- frame_remove_instance(c->data.html.object[i].content,
- bw, c,
- c->data.html.object[i].box,
- c->data.html.object[i].box->object_params,
- &c->data.html.object[i].box->object_state);
- else
-#endif
- content_remove_instance(c->data.html.object[i].content,
+ content_remove_instance(c->data.html.object[i].content,
bw, c,
c->data.html.object[i].box,
c->data.html.object[i].box->object_params,