From 58ad2aba2970fd564b4348cfd9b8603e191b67da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 26 Jun 2006 15:53:41 +0000 Subject: [PATCH] added BColumnListView to libbe.so git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17927 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/interface/ColorTools.h | 2 ++ src/kits/interface/Jamfile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/headers/private/interface/ColorTools.h b/headers/private/interface/ColorTools.h index 7c91767fe3..ff5186a377 100644 --- a/headers/private/interface/ColorTools.h +++ b/headers/private/interface/ColorTools.h @@ -64,6 +64,7 @@ inline bool operator!=(const rgb_color c1, const rgb_color c2) return (*((uint32*)&c1)) != (*((uint32*)&c2)); } +#ifndef __HAIKU__ // Color creation. inline rgb_color make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha=255) @@ -75,6 +76,7 @@ inline rgb_color make_color(uint8 red, uint8 green, uint8 blue, uint8 alpha=255) c.alpha = alpha; return c; } +#endif // Mix two colors together, ignoring their relative alpha channels. // If amount is 0, the result is color1; if 255, the result is color2; diff --git a/src/kits/interface/Jamfile b/src/kits/interface/Jamfile index 6f4f9a179f..7898a79df9 100644 --- a/src/kits/interface/Jamfile +++ b/src/kits/interface/Jamfile @@ -38,8 +38,10 @@ MergeObject interface_kit.o : ChannelControl.cpp ChannelSlider.cpp CheckBox.cpp + ColumnListView.cpp ColorConversion.cpp ColorControl.cpp + ColorTools.cpp Control.cpp Deskbar.cpp Dragger.cpp