From f4cee9d5f5ad8024e2553c79764cb9cbcd6695be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 15 Nov 2005 23:46:02 +0000 Subject: [PATCH] fix the FBC problem, as Ingo pointed out, derived classes contain slots for all virtuals defined in the base class, therefor, it is ok to just define WindowActivated for BScrollBar. The only problem is that BScrollBar::WindowActivated() cannot be called from apps having overridden WindowActivated() in a BScrollBar subclass of their own. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14953 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/interface/ScrollBar.h | 4 ---- src/kits/interface/ScrollBar.cpp | 2 -- 2 files changed, 6 deletions(-) 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() {}