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
This commit is contained in:
parent
b894f5f778
commit
f4cee9d5f5
@ -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();
|
||||
|
@ -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() {}
|
||||
|
Loading…
Reference in New Issue
Block a user