Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14953 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-11-15 23:46:02 +00:00
parent b894f5f778
commit f4cee9d5f5
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/os/interface/ScrollBar.h
View File

@ -85,7 +85,6 @@ virtual status_t GetSupportedSuites(BMessage *data);
//----- Private or reserved ----------------------------------------- //----- Private or reserved -----------------------------------------
virtual status_t Perform(perform_code d, void *arg); virtual status_t Perform(perform_code d, void *arg);
// NOTE: this takes up another virtual slot compared to R5
#if DISABLES_ON_WINDOW_DEACTIVATION #if DISABLES_ON_WINDOW_DEACTIVATION
virtual void WindowActivated(bool active); virtual void WindowActivated(bool active);
#endif #endif
@ -96,10 +95,7 @@ private:
friend status_t control_scrollbar(scroll_bar_info *info, BScrollBar *bar); // for use within the preflet friend status_t control_scrollbar(scroll_bar_info *info, BScrollBar *bar); // for use within the preflet
#if !DISABLES_ON_WINDOW_DEACTIVATION
virtual void _ReservedScrollBar1(); virtual void _ReservedScrollBar1();
#endif
virtual void _ReservedScrollBar2(); virtual void _ReservedScrollBar2();
virtual void _ReservedScrollBar3(); virtual void _ReservedScrollBar3();
virtual void _ReservedScrollBar4(); virtual void _ReservedScrollBar4();

2
src/kits/interface/ScrollBar.cpp
View File

@ -951,9 +951,7 @@ BScrollBar::WindowActivated(bool active)
} }
#endif // DISABLES_ON_WINDOW_DEACTIVATION #endif // DISABLES_ON_WINDOW_DEACTIVATION
#if !DISABLES_ON_WINDOW_DEACTIVATION
void BScrollBar::_ReservedScrollBar1() {} void BScrollBar::_ReservedScrollBar1() {}
#endif
void BScrollBar::_ReservedScrollBar2() {} void BScrollBar::_ReservedScrollBar2() {}
void BScrollBar::_ReservedScrollBar3() {} void BScrollBar::_ReservedScrollBar3() {}
void BScrollBar::_ReservedScrollBar4() {} void BScrollBar::_ReservedScrollBar4() {}