i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"#ifdef __HAIKU__" is no longer needed with the new build system.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14945 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-15 13:47:48 +00:00
parent 6ff4803446
commit 44534147b1
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/Slider.h
+1 -6
View File
@@ -137,9 +137,7 @@ class BSlider : public BControl {
virtual void SetFont(const BFont *font, uint32 properties = B_FONT_ALL); virtual void SetFont(const BFont *font, uint32 properties = B_FONT_ALL);
#ifdef __HAIKU__ virtual void SetLimits(int32 minimum, int32 maximum);
virtual void SetLimits(int32 minimum, int32 maximum); // Was _ReservedSlider4()
#endif
private: private:
void _DrawBlockThumb(); void _DrawBlockThumb();
@@ -152,9 +150,6 @@ class BSlider : public BControl {
float _MaxPosition() const; float _MaxPosition() const;
bool _ConstrainPoint(BPoint point, BPoint compare) const; bool _ConstrainPoint(BPoint point, BPoint compare) const;
#ifndef __HAIKU__
virtual void _ReservedSlider4();
#endif
virtual void _ReservedSlider5(); virtual void _ReservedSlider5();
virtual void _ReservedSlider6(); virtual void _ReservedSlider6();
virtual void _ReservedSlider7(); virtual void _ReservedSlider7();
src/kits/interface/Slider.cpp
+8 -8
View File
@@ -29,6 +29,7 @@ _long_to_color_(int32 color)
return *((rgb_color*)&color); return *((rgb_color*)&color);
} }
int32 int32
_color_to_long_(rgb_color color) _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, BSlider::BSlider(BRect frame, const char *name, const char *label, BMessage *message,
int32 minValue, int32 maxValue, thumb_style thumbType, int32 minValue, int32 maxValue, thumb_style thumbType,
uint32 resizingMode, uint32 flags) uint32 resizingMode, uint32 flags)
@@ -1442,7 +1446,6 @@ BSlider::SetFont(const BFont *font, uint32 properties)
} }
#ifdef __HAIKU__
void void
BSlider::SetLimits(int32 minimum, int32 maximum) BSlider::SetLimits(int32 minimum, int32 maximum)
{ {
@@ -1459,7 +1462,6 @@ BSlider::SetLimits(int32 minimum, int32 maximum)
} }
} }
} }
#endif
void void
@@ -1691,8 +1693,8 @@ BSlider::_MinPosition() const
{ {
if (fOrientation == B_HORIZONTAL) if (fOrientation == B_HORIZONTAL)
return BarFrame().left + 1.0f; 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) if (fOrientation == B_HORIZONTAL)
return BarFrame().right - 1.0f; return BarFrame().right - 1.0f;
else
return BarFrame().top + 1.0f; return BarFrame().top + 1.0f;
} }
extern "C" extern "C"
void _ReservedSlider4__7BSlider(BSlider *slider, int32 minimum, int32 maximum) void _ReservedSlider4__7BSlider(BSlider *slider, int32 minimum, int32 maximum)
{ {
#ifdef __HAIKU__
slider->BSlider::SetLimits(minimum, maximum); slider->BSlider::SetLimits(minimum, maximum);
#endif
} }