diff --git a/headers/os/interface/ScrollBar.h b/headers/os/interface/ScrollBar.h index 61f45ef5a6..d603deab56 100644 --- a/headers/os/interface/ScrollBar.h +++ b/headers/os/interface/ScrollBar.h @@ -85,7 +85,6 @@ virtual status_t GetSupportedSuites(BMessage *data); //----- Private or reserved ----------------------------------------- virtual status_t Perform(perform_code d, void *arg); -// NOTE: this takes up another virtual slot compared to R5 #if DISABLES_ON_WINDOW_DEACTIVATION virtual void WindowActivated(bool active); #endif @@ -96,10 +95,7 @@ private: friend status_t control_scrollbar(scroll_bar_info *info, BScrollBar *bar); // for use within the preflet -#if !DISABLES_ON_WINDOW_DEACTIVATION virtual void _ReservedScrollBar1(); -#endif - virtual void _ReservedScrollBar2(); virtual void _ReservedScrollBar3(); virtual void _ReservedScrollBar4(); diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp index 84198e978a..ca03dad183 100644 --- a/src/kits/interface/ScrollBar.cpp +++ b/src/kits/interface/ScrollBar.cpp @@ -951,9 +951,7 @@ BScrollBar::WindowActivated(bool active) } #endif // DISABLES_ON_WINDOW_DEACTIVATION -#if !DISABLES_ON_WINDOW_DEACTIVATION void BScrollBar::_ReservedScrollBar1() {} -#endif void BScrollBar::_ReservedScrollBar2() {} void BScrollBar::_ReservedScrollBar3() {} void BScrollBar::_ReservedScrollBar4() {}