From 9fe3529f3eadd7f63c3185589caa341b79402251 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 4 Jul 2020 19:40:59 -0400 Subject: [PATCH] BScrollBar: Remove DISABLE_ON_WINDOW_DEACTIVATION constant. It was always enabled, and disabling it would break ABI. If we want to make it disable-able, it needs to be a setting, but I don't really see a reason for that. --- 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 fb3d37e2be..b033c4d8d6 100644 --- a/headers/os/interface/ScrollBar.h +++ b/headers/os/interface/ScrollBar.h @@ -12,8 +12,6 @@ #define B_V_SCROLL_BAR_WIDTH 14.0f #define B_H_SCROLL_BAR_HEIGHT 14.0f -#define DISABLES_ON_WINDOW_DEACTIVATION 1 - class BScrollBar : public BView { public: @@ -46,9 +44,7 @@ public: virtual void MouseMoved(BPoint where, uint32 code, const BMessage* dragMessage); -#if DISABLES_ON_WINDOW_DEACTIVATION virtual void WindowActivated(bool active); -#endif void SetValue(float value); float Value() const; diff --git a/src/kits/interface/ScrollBar.cpp b/src/kits/interface/ScrollBar.cpp index ab5077d640..321f2fd612 100644 --- a/src/kits/interface/ScrollBar.cpp +++ b/src/kits/interface/ScrollBar.cpp @@ -720,14 +720,12 @@ BScrollBar::MouseUp(BPoint where) } -#if DISABLES_ON_WINDOW_DEACTIVATION void BScrollBar::WindowActivated(bool active) { fPrivateData->fEnabled = active; Invalidate(); } -#endif // DISABLES_ON_WINDOW_DEACTIVATION void