From a445243cff2ff082b1b92bfaa5f9f59c88c91da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Thu, 20 Apr 2006 20:02:27 +0000 Subject: [PATCH] B_COLOR_8_BIT is deprecated git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17180 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/ColumnListView.cpp | 8 ++++---- src/kits/interface/MenuItem.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/kits/interface/ColumnListView.cpp b/src/kits/interface/ColumnListView.cpp index 1a04fbe35d..79a31119ea 100644 --- a/src/kits/interface/ColumnListView.cpp +++ b/src/kits/interface/ColumnListView.cpp @@ -1641,11 +1641,11 @@ TitleView::TitleView(BRect rect, OutlineView *horizontalSlave, BList *visibleCol fDrawBuffer->Unlock(); #endif - fUpSortArrow = new BBitmap(BRect(0, 0, 7, 7), B_COLOR_8_BIT); - fDownSortArrow = new BBitmap(BRect(0, 0, 7, 7), B_COLOR_8_BIT); + fUpSortArrow = new BBitmap(BRect(0, 0, 7, 7), B_CMAP8); + fDownSortArrow = new BBitmap(BRect(0, 0, 7, 7), B_CMAP8); - fUpSortArrow->SetBits((const void*) kUpSortArrow8x8, 64, 0, B_COLOR_8_BIT); - fDownSortArrow->SetBits((const void*) kDownSortArrow8x8, 64, 0, B_COLOR_8_BIT); + fUpSortArrow->SetBits((const void*) kUpSortArrow8x8, 64, 0, B_CMAP8); + fDownSortArrow->SetBits((const void*) kDownSortArrow8x8, 64, 0, B_CMAP8); #if _INCLUDES_CLASS_CURSOR fResizeCursor = new BCursor(kResizeCursorData); diff --git a/src/kits/interface/MenuItem.cpp b/src/kits/interface/MenuItem.cpp index 54eb5ad7b1..0cad7b6065 100644 --- a/src/kits/interface/MenuItem.cpp +++ b/src/kits/interface/MenuItem.cpp @@ -730,12 +730,12 @@ BMenuItem::_DrawShortcutSymbol() if (fModifiers & B_COMMAND_KEY) { BRect rect(0,0,16,10); - BBitmap control(rect, B_COLOR_8_BIT); + BBitmap control(rect, B_CMAP8); if (BMenu::sAltAsCommandKey) - control.SetBits(kAltBits, kAltLength, 0, B_COLOR_8_BIT); + control.SetBits(kAltBits, kAltLength, 0, B_CMAP8); else - control.SetBits(kCtrlBits, kCtrlLength, 0, B_COLOR_8_BIT); + control.SetBits(kCtrlBits, kCtrlLength, 0, B_CMAP8); fSuper->DrawBitmap(&control, where); where.x -= rect.Width() + 1; @@ -743,12 +743,12 @@ BMenuItem::_DrawShortcutSymbol() if (fModifiers & B_CONTROL_KEY) { BRect rect(0,0,16,10); - BBitmap control(rect, B_COLOR_8_BIT); + BBitmap control(rect, B_CMAP8); if (BMenu::sAltAsCommandKey) - control.SetBits(kCtrlBits, kCtrlLength, 0, B_COLOR_8_BIT); + control.SetBits(kCtrlBits, kCtrlLength, 0, B_CMAP8); else - control.SetBits(kAltBits, kAltLength, 0, B_COLOR_8_BIT); + control.SetBits(kAltBits, kAltLength, 0, B_CMAP8); fSuper->DrawBitmap(&control, where); where.x -= rect.Width() + 1; @@ -756,8 +756,8 @@ BMenuItem::_DrawShortcutSymbol() if (fModifiers & B_SHIFT_KEY) { BRect rect(0,0,21,10); - BBitmap shift(rect, B_COLOR_8_BIT); - shift.SetBits(kShiftBits, kShiftLength, 0, B_COLOR_8_BIT); + BBitmap shift(rect, B_CMAP8); + shift.SetBits(kShiftBits, kShiftLength, 0, B_CMAP8); fSuper->DrawBitmap(&shift, where - BPoint(6, 0)); } }