Merge remote-tracking branch 'haiku/master' into package-management

This reverts 8f7f28a7c3 (OpenGL: Upgrade
to
Mesa 9.2).

Conflicts:
	build/jam/BuildFeatures
	build/jam/HaikuImage
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/opengl/swpipe/Jamfile
	src/apps/diskusage/Jamfile
	src/kits/tracker/ContainerWindow.cpp
	src/kits/tracker/DeskWindow.cpp
	src/kits/tracker/Jamfile

headers/os/interface/ColorControl.h

@@ -72,7 +72,7 @@ public:
 									int32 what, const char* property);
 	virtual	status_t			GetSupportedSuites(BMessage* data);
 
-	virtual	void				MakeFocus(bool state = true);
+	virtual	void				MakeFocus(bool focused = true);
 	virtual	void				AllAttached();
 	virtual	void				AllDetached();
 
@@ -92,6 +92,8 @@ private:
 									BMessage* archive = NULL);
 			void				_LayoutView();
 			void				_InitOffscreen();
+			void				_InvalidateSelector(int16 ramp,
+									rgb_color color, bool focused);
 			void				_DrawColorArea(BView* target, BRect update);
 			void				_DrawSelectors(BView* target);
 			void				_DrawColorRamp(BRect rect, BView* target,
@@ -124,8 +126,9 @@ private:
 			BBitmap*			fBitmap;
 			BView*				fOffscreenView;
 
-			int32				fFocusedComponent;	
-			uint32				_reserved[2];	
+			int16				fFocusedRamp;
+			int16				fClickedRamp;
+			uint32				_reserved[2];
 };
 
 inline void

headers/os/interface/MenuField.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2011, Haiku, Inc. All rights reserved.
+ * Copyright 2006-2013, Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _MENU_FIELD_H
@@ -42,7 +42,7 @@ public:
 	virtual	void				AllAttached();
 	virtual	void				MouseDown(BPoint where);
 	virtual	void				KeyDown(const char* bytes, int32 numBytes);
-	virtual	void				MakeFocus(bool state);
+	virtual	void				MakeFocus(bool focused);
 	virtual	void				MessageReceived(BMessage* message);
 	virtual	void				WindowActivated(bool state);
 	virtual	void				MouseUp(BPoint where);
@@ -121,9 +121,12 @@ private:
 								BMenuField(const char* label,
 									BMenu* menu, BMessage* message);
 
+			void				_DrawLabel(BRect updateRect);
+			void				_DrawMenuBar(BRect updateRect);
+
 			void				InitObject(const char* label);
 			void				InitObject2();
-			void				DrawLabel(BRect updateRect);
+
 	static	void				InitMenu(BMenu* menu);
 
 			int32				_MenuTask();
@@ -145,8 +148,6 @@ private:
 			alignment			fAlign;
 			float				fDivider;
 			bool				fEnabled;
-			bool				fSelected;
-			bool				fTransition;
 			bool				fFixedSizeMB;
 			thread_id			fMenuTaskID;
 

headers/os/interface/Window.h

@@ -123,7 +123,7 @@ public:
 			void				Zoom();
 			void				SetZoomLimits(float maxWidth, float maxHeight);
 	virtual void				ScreenChanged(BRect screenSize,
-									color_space format);
+									color_space depth);
 
 			void				SetPulseRate(bigtime_t rate);
 			bigtime_t			PulseRate() const;
@@ -219,7 +219,7 @@ public:
 
 	virtual BHandler*			ResolveSpecifier(BMessage* message,
 									int32 index, BMessage* specifier,
-									int32 form, const char* property);
+									int32 what, const char* property);
 	virtual status_t			GetSupportedSuites(BMessage* data);
 
 			status_t			AddToSubset(BWindow* window);