diff --git a/headers/os/interface/Slider.h b/headers/os/interface/Slider.h index 266229e2c4..f7d81da70f 100644 --- a/headers/os/interface/Slider.h +++ b/headers/os/interface/Slider.h @@ -137,9 +137,7 @@ class BSlider : public BControl { virtual void SetFont(const BFont *font, uint32 properties = B_FONT_ALL); -#ifdef __HAIKU__ - virtual void SetLimits(int32 minimum, int32 maximum); // Was _ReservedSlider4() -#endif + virtual void SetLimits(int32 minimum, int32 maximum); private: void _DrawBlockThumb(); @@ -152,9 +150,6 @@ class BSlider : public BControl { float _MaxPosition() const; bool _ConstrainPoint(BPoint point, BPoint compare) const; -#ifndef __HAIKU__ - virtual void _ReservedSlider4(); -#endif virtual void _ReservedSlider5(); virtual void _ReservedSlider6(); virtual void _ReservedSlider7(); diff --git a/src/kits/interface/Slider.cpp b/src/kits/interface/Slider.cpp index 1352383386..abd5e0ae1d 100644 --- a/src/kits/interface/Slider.cpp +++ b/src/kits/interface/Slider.cpp @@ -29,6 +29,7 @@ _long_to_color_(int32 color) return *((rgb_color*)&color); } + int32 _color_to_long_(rgb_color color) { @@ -36,6 +37,9 @@ _color_to_long_(rgb_color color) } +// #pragma mark - + + BSlider::BSlider(BRect frame, const char *name, const char *label, BMessage *message, int32 minValue, int32 maxValue, thumb_style thumbType, uint32 resizingMode, uint32 flags) @@ -1442,7 +1446,6 @@ BSlider::SetFont(const BFont *font, uint32 properties) } -#ifdef __HAIKU__ void BSlider::SetLimits(int32 minimum, int32 maximum) { @@ -1459,7 +1462,6 @@ BSlider::SetLimits(int32 minimum, int32 maximum) } } } -#endif void @@ -1691,8 +1693,8 @@ BSlider::_MinPosition() const { if (fOrientation == B_HORIZONTAL) return BarFrame().left + 1.0f; - else - return BarFrame().bottom - 1.0f; + + return BarFrame().bottom - 1.0f; } @@ -1701,17 +1703,15 @@ BSlider::_MaxPosition() const { if (fOrientation == B_HORIZONTAL) return BarFrame().right - 1.0f; - else - return BarFrame().top + 1.0f; + + return BarFrame().top + 1.0f; } extern "C" void _ReservedSlider4__7BSlider(BSlider *slider, int32 minimum, int32 maximum) { -#ifdef __HAIKU__ slider->BSlider::SetLimits(minimum, maximum); -#endif }