summaryrefslogtreecommitdiff
path: root/beos/system_colour.cpp
diff options
context:
space:
mode:
authorFran├žois Revel <mmu_man@netsurf-browser.org>2011-01-30 17:25:36 +0000
committerFran├žois Revel <mmu_man@netsurf-browser.org>2011-01-30 17:25:36 +0000
commit541864d501175918dee6f8dab8a6b3244ad7a62f (patch)
tree76ebad41be56582974825d8860b5596cd4706704 /beos/system_colour.cpp
parentfbb1139214f3c4fa7925c572eca05e27873e05ea (diff)
downloadnetsurf-541864d501175918dee6f8dab8a6b3244ad7a62f.tar.gz
netsurf-541864d501175918dee6f8dab8a6b3244ad7a62f.tar.bz2
Fix BeOS build.
svn path=/trunk/netsurf/; revision=11531
Diffstat (limited to 'beos/system_colour.cpp')
-rw-r--r--beos/system_colour.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/beos/system_colour.cpp b/beos/system_colour.cpp
index b58717492..dd878d45b 100644
--- a/beos/system_colour.cpp
+++ b/beos/system_colour.cpp
@@ -21,15 +21,27 @@
*
*/
+#define __STDBOOL_H__ 1
+#include <assert.h>
+#include <ctype.h>
+#include <stdbool.h>
+
+#include <InterfaceDefs.h>
+
+extern "C" {
+
#include "utils/utils.h"
#include "utils/log.h"
#include "desktop/gui.h"
#include "desktop/options.h"
+#include "desktop/plot_style.h"
+
+}
struct gui_system_colour_ctx {
const char *name;
int length;
- css_color colour;
+ css_color css_colour;
colour *option_colour;
lwc_string *lwcstr;
};
@@ -232,7 +244,7 @@ bool gui_system_colour_init(void)
/* pull in options if set (ie not transparent) */
for (ccount = 0; ccount < colour_list_len; ccount++) {
if (*(colour_list[ccount].option_colour) != 0) {
- colour_list[ccount].colour = *(colour_list[ccount].option_colour);
+ colour_list[ccount].css_colour = *(colour_list[ccount].option_colour);
}
}
@@ -259,14 +271,14 @@ colour gui_system_colour_char(char *name)
if (strncasecmp(name,
colour_list[ccount].name,
colour_list[ccount].length) == 0) {
- ret = colour_list[ccount].colour;
+ ret = colour_list[ccount].css_colour;
break;
}
}
return ret;
}
-css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
+css_error gui_system_colour(void *pw, lwc_string *name, css_color *css_colour)
{
unsigned int ccount;
bool match;
@@ -275,7 +287,7 @@ css_error gui_system_colour(void *pw, lwc_string *name, css_color *colour)
if (lwc_string_caseless_isequal(name,
colour_list[ccount].lwcstr,
&match) == lwc_error_ok && match) {
- *colour = colour_list[ccount].colour;
+ *css_colour = colour_list[ccount].css_colour;
return CSS_OK;
}
}