Fix test_app_server build, again

- Interface Kit tests use a View class which is not BView, and has no
SetViewUIColor.
- Libexpat is now in a separate package.
- Shouldn't we add this to the buildbots so we can cath the breakage?
This commit is contained in:
Adrien Destugues
2016-02-14 21:12:33 +01:00
parent e9eb82cc53
commit 884412df8e
7 changed files with 12 additions and 9 deletions
@@ -16,7 +16,7 @@
CheckBox::CheckBox(BMessage* message, BMessenger target) CheckBox::CheckBox(BMessage* message, BMessenger target)
: AbstractButton(BUTTON_POLICY_TOGGLE_ON_RELEASE, message, target) : AbstractButton(BUTTON_POLICY_TOGGLE_ON_RELEASE, message, target)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
} }
@@ -59,7 +59,7 @@ GroupView::GroupView(enum orientation orientation, int32 lineCount)
fColumnInfos(NULL), fColumnInfos(NULL),
fRowInfos(NULL) fRowInfos(NULL)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
if (fLineCount < 1) if (fLineCount < 1)
fLineCount = 1; fLineCount = 1;
@@ -377,7 +377,7 @@ GroupView::_ChildAt(int32 column, int32 row) const
Glue::Glue() Glue::Glue()
: View() : View()
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
} }
@@ -389,7 +389,7 @@ Strut::Strut(float pixelWidth, float pixelHeight)
fSize(pixelWidth >= 0 ? pixelWidth - 1 : B_SIZE_UNSET, fSize(pixelWidth >= 0 ? pixelWidth - 1 : B_SIZE_UNSET,
pixelHeight >= 0 ? pixelHeight - 1 : B_SIZE_UNSET) pixelHeight >= 0 ? pixelHeight - 1 : B_SIZE_UNSET)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
} }
@@ -16,7 +16,7 @@
RadioButton::RadioButton(BMessage* message, BMessenger target) RadioButton::RadioButton(BMessage* message, BMessenger target)
: AbstractButton(BUTTON_POLICY_SELECT_ON_RELEASE, message, target) : AbstractButton(BUTTON_POLICY_SELECT_ON_RELEASE, message, target)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
} }
@@ -19,7 +19,7 @@ StringView::StringView(const char* string)
fStringWidth(0), fStringWidth(0),
fExplicitMinSize(B_SIZE_UNSET, B_SIZE_UNSET) fExplicitMinSize(B_SIZE_UNSET, B_SIZE_UNSET)
{ {
SetViewUIColor(B_PANEL_BACKGROUND_COLOR); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
fTextColor = (rgb_color){ 0, 0, 0, 255 }; fTextColor = (rgb_color){ 0, 0, 0, 255 };
} }
@@ -79,7 +79,7 @@ public:
fTest(test) fTest(test)
{ {
fViewContainer = new ViewContainer(Bounds()); fViewContainer = new ViewContainer(Bounds());
fViewContainer->View::SetViewUIColor(B_PANEL_BACKGROUND_COLOR); fViewContainer->View::SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
AddChild(fViewContainer); AddChild(fViewContainer);
// container view for the tested BView // container view for the tested BView
@@ -90,7 +90,7 @@ public:
// container for the test's controls // container for the test's controls
fTestControlsView = new View(BRect(410, 10, 690, 400)); fTestControlsView = new View(BRect(410, 10, 690, 400));
fTestControlsView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); fTestControlsView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
fViewContainer->View::AddChild(fTestControlsView); fViewContainer->View::AddChild(fTestControlsView);
// wrapper view // wrapper view
+3 -1
View File
@@ -23,7 +23,9 @@ UseLibraryHeaders agg expat ;
SimpleTest PictureTest : SimpleTest PictureTest :
PictureTest.cpp PictureTest.cpp
SVGViewView.cpp SVGViewView.cpp
: be translation libexpat.a [ TargetLibsupc++ ] : be translation
[ BuildFeatureAttribute expat : library ]
[ TargetLibsupc++ ]
; ;
if $(TARGET_PLATFORM) = libbe_test { if $(TARGET_PLATFORM) = libbe_test {
+1
View File
@@ -101,6 +101,7 @@ SharedLibrary libtestappserver.so :
CursorData.cpp CursorData.cpp
CursorManager.cpp CursorManager.cpp
CursorSet.cpp CursorSet.cpp
DelayedMessage.cpp
DesktopListener.cpp DesktopListener.cpp
DirectWindowInfo.cpp DirectWindowInfo.cpp
DrawingEngine.cpp DrawingEngine.cpp