summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Revel <mmu_man@netsurf-browser.org>2012-04-17 19:08:30 +0000
committerFrançois Revel <mmu_man@netsurf-browser.org>2012-04-17 19:08:30 +0000
commitc48bb86cb11201c8c46bcd2b4b7ad5450075be03 (patch)
tree3f19b224b5250315897d82376574f8c9fb14026f
parent7224990953f51ce227742df2626b49c6cdc6b47b (diff)
downloadnetsurf-c48bb86cb11201c8c46bcd2b4b7ad5450075be03.tar.gz
netsurf-c48bb86cb11201c8c46bcd2b4b7ad5450075be03.tar.bz2
Fix building on Haiku.
Some ui_color codes were renamed recently. Account for this. svn path=/trunk/netsurf/; revision=13879
-rw-r--r--beos/system_colour.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/beos/system_colour.cpp b/beos/system_colour.cpp
index eeac33fc5..9f3f4084b 100644
--- a/beos/system_colour.cpp
+++ b/beos/system_colour.cpp
@@ -56,8 +56,8 @@ extern "C" {
#define B_SHINE_COLOR ((color_which)18)
#define B_SHADOW_COLOR ((color_which)19)
#define B_MENU_SELECTED_BORDER_COLOR ((color_which)9)
-#define B_TOOLTIP_BACKGROUND_COLOR ((color_which)20)
-#define B_TOOLTIP_TEXT_COLOR ((color_which)21)
+#define B_TOOL_TIP_BACKGROUND_COLOR ((color_which)20)
+#define B_TOOL_TIP_TEXT_COLOR ((color_which)21)
#define B_SUCCESS_COLOR ((color_which)100)
#define B_FAILURE_COLOR ((color_which)101)
#define B_MENU_SELECTED_BACKGROUND_COLOR B_MENU_SELECTION_BACKGROUND_COLOR
@@ -68,6 +68,11 @@ extern "C" {
#define B_DSANDLER_FAVORITE_SHOES_COLOR ((color_which)0x80000004)
#define B_DAVE_BROWN_FAVORITE_COLOR ((color_which)0x80000005)
#endif
+#if defined(B_BEOS_VERSION_DANO)
+#define B_TOOL_TIP_BACKGROUND_COLOR B_TOOLTIP_BACKGROUND_COLOR
+#define B_TOOL_TIP_TEXT_COLOR B_TOOLTIP_TEXT_COLOR
+#define
+#endif
#define NOCOL ((color_which)0)
@@ -192,14 +197,14 @@ static struct gui_system_colour_ctx colour_list[] = {
0xffaaaaaa,
&nsoption_colour(sys_colour_InfoBackground),
NULL,
- B_TOOLTIP_BACKGROUND_COLOR
+ B_TOOL_TIP_BACKGROUND_COLOR
}, {
"InfoText",
SLEN("InfoText"),
0xff000000,
&nsoption_colour(sys_colour_InfoText),
NULL,
- B_TOOLTIP_TEXT_COLOR
+ B_TOOL_TIP_TEXT_COLOR
}, {
"Menu",
SLEN("Menu"),