From fdbc56b338b1452bdf71068381efd3f733cd7a84 Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 11 Aug 2005 20:50:58 +0000 Subject: [PATCH] Fixed build for R5 target git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13936 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/interface/BTextView/TextView.cpp | 2 -- src/kits/interface/InterfaceDefs.cpp | 8 -------- 2 files changed, 10 deletions(-) diff --git a/src/kits/interface/BTextView/TextView.cpp b/src/kits/interface/BTextView/TextView.cpp index 4dae31f7d5..021f731083 100644 --- a/src/kits/interface/BTextView/TextView.cpp +++ b/src/kits/interface/BTextView/TextView.cpp @@ -119,12 +119,10 @@ public: }; -#ifndef COMPILE_FOR_R5 // Initialized/finalized by init/fini_interface_kit _BWidthBuffer_* BTextView::sWidths = NULL; sem_id BTextView::sWidthSem = B_BAD_SEM_ID; int32 BTextView::sWidthAtom = 0; -#endif const static rgb_color kBlackColor = { 0, 0, 0, 255 }; const static rgb_color kBlueInputColor = { 152, 203, 255, 255 }; diff --git a/src/kits/interface/InterfaceDefs.cpp b/src/kits/interface/InterfaceDefs.cpp index 7a84890825..f537678dfb 100644 --- a/src/kits/interface/InterfaceDefs.cpp +++ b/src/kits/interface/InterfaceDefs.cpp @@ -176,8 +176,6 @@ system_colors() return BScreen(B_MAIN_SCREEN_ID).ColorMap(); } -#ifndef COMPILE_FOR_R5 - _IMPEXP_BE status_t set_screen_space(int32 index, uint32 space, bool stick) { @@ -246,8 +244,6 @@ set_scroll_bar_info(scroll_bar_info *info) return B_ERROR; } -#endif // COMPILE_FOR_R5 - _IMPEXP_BE status_t get_mouse_type(int32 *type) { @@ -556,8 +552,6 @@ keyboard_navigation_color() } -#ifndef COMPILE_FOR_R5 - _IMPEXP_BE int32 count_workspaces() { @@ -1312,5 +1306,3 @@ truncate_string(const char* string, uint32 mode, float width, } } - -#endif // !COMPILE_FOR_R5