summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Revel <mmu_man@netsurf-browser.org>2011-03-17 20:53:59 +0000
committerFrançois Revel <mmu_man@netsurf-browser.org>2011-03-17 20:53:59 +0000
commitfea411b71e49ee6d49b4fc9511b971d29d0e856b (patch)
tree60e05caefc86872332d99f623504cc428e0ad15f
parentd86e8b49c4e9c3dad723c98f2e90e6d698a7c1bb (diff)
downloadnetsurf-fea411b71e49ee6d49b4fc9511b971d29d0e856b.tar.gz
netsurf-fea411b71e49ee6d49b4fc9511b971d29d0e856b.tar.bz2
Fix BeOS build:
- missing include, - use css_computed_color() accessor instead of struct css_computed_style member as it's now opaque to us. svn path=/trunk/netsurf/; revision=12100
-rw-r--r--beos/beos_scaffolding.cpp1
-rw-r--r--beos/beos_window.cpp5
2 files changed, 5 insertions, 1 deletions
diff --git a/beos/beos_scaffolding.cpp b/beos/beos_scaffolding.cpp
index b1c604829..536b39e96 100644
--- a/beos/beos_scaffolding.cpp
+++ b/beos/beos_scaffolding.cpp
@@ -54,6 +54,7 @@ extern "C" {
#include "render/form.h"
#include "render/html.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
#include "utils/log.h"
}
diff --git a/beos/beos_window.cpp b/beos/beos_window.cpp
index 2600b85af..e136949e8 100644
--- a/beos/beos_window.cpp
+++ b/beos/beos_window.cpp
@@ -1885,7 +1885,10 @@ static bool copy_handler(const char *text, size_t length, struct box *box,
nsbeos_style_to_font(font, &style);
run->offset = current_selection.Length();
run->font = font;
- run->color = nsbeos_rgb_colour(nscss_color_to_ns(box->style->color));
+ css_color csscolor;
+ if (css_computed_color(box->style, &csscolor) == CSS_COLOR_COLOR) {
+ run->color = nsbeos_rgb_colour(nscss_color_to_ns(csscolor));
+ }
current_selection_textruns.AddItem(run);
space = box->space != 0;
}