From c48bb86cb11201c8c46bcd2b4b7ad5450075be03 Mon Sep 17 00:00:00 2001 From: François Revel Date: Tue, 17 Apr 2012 19:08:30 +0000 Subject: Fix building on Haiku. Some ui_color codes were renamed recently. Account for this. svn path=/trunk/netsurf/; revision=13879 --- beos/system_colour.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'beos') 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"), -- cgit v1.2.3