Merge branch 'master' into x86_64

headers/os/interface/StringView.h

@@ -9,7 +9,7 @@
 #include <View.h>
 
 
-class BStringView : public BView{
+class BStringView : public BView {
 public:
 								BStringView(BRect bounds, const char* name,
 									const char* text, uint32 resizeFlags

headers/os/interface/View.h

@@ -584,6 +584,8 @@ protected:
 
 	virtual	void				LayoutChanged();
 
+			void				ScrollWithMouseWheelDelta(BScrollBar*, float);
+
 private:
 			void				_Layout(bool force, BLayoutContext* context);
 			void				_LayoutLeft(BLayout* deleted);

headers/private/shared/StringForRate.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010 Haiku Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef STRING_FOR_RATE_H
+#define STRING_FOR_RATE_H
+
+#include <SupportDefs.h>
+
+
+namespace BPrivate {
+
+
+const char* string_for_rate(double rate, char* string, size_t stringSize,
+	double base = 1000.0f);
+
+
+}	// namespace BPrivate
+
+
+using BPrivate::string_for_rate;
+
+
+#endif // COLOR_QUANTIZER_H