Replace remaining InvalidateLayout()'s with LayoutInvalidated(). Also do a bit of cleanup/move methods around.

headers/os/interface/Menu.h

@@ -77,8 +77,6 @@ public:
 	virtual	void				DoLayout();
 	virtual	void				FrameMoved(BPoint newPosition);
 	virtual	void				FrameResized(float newWidth, float newHeight);
-			void				InvalidateLayout();
-	virtual	void				InvalidateLayout(bool descendants);
 
 	virtual void				MakeFocus(bool focus = true);
 
@@ -139,6 +137,8 @@ protected:
 									uint32 resizeMask, uint32 flags,
 									menu_layout layout, bool resizeToFit);
 
+	virtual	void				LayoutInvalidated(bool descendants);
+
 	virtual	BPoint				ScreenLocation();
 
 			void				SetItemMargins(float left, float top,

headers/os/interface/MenuField.h

@@ -83,14 +83,13 @@ public:
 	virtual	BSize				MaxSize();
 	virtual	BSize				PreferredSize();
 
-	virtual	void				InvalidateLayout(bool descendants = false);
-
 			BLayoutItem*		CreateLabelLayoutItem();
 			BLayoutItem*		CreateMenuBarLayoutItem();
 
 	virtual status_t			Perform(perform_code d, void* arg);
 
 protected:
+	virtual	void				LayoutInvalidated(bool descendants);
 	virtual	void				DoLayout();
 
 private:

headers/os/interface/ScrollView.h

@@ -48,8 +48,6 @@ public:
 	virtual	BSize				PreferredSize();
 	virtual void				ResizeToPreferred();
 
-	virtual	void				InvalidateLayout(bool descendants = false);
-	virtual	void				DoLayout();
 	virtual	void				FrameMoved(BPoint position);
 	virtual	void				FrameResized(float width, float height);
 
@@ -80,6 +78,10 @@ public:
 
 	virtual status_t			Perform(perform_code d, void* arg);
 
+protected:
+	virtual	void				LayoutInvalidated(bool descendants = false);
+	virtual	void				DoLayout();
+
 private:
 	// FBC padding and forbidden methods
 	virtual	void				_ReservedScrollView1();

headers/os/interface/Slider.h

@@ -156,12 +156,13 @@ public:
 
 	virtual	float				MaxUpdateTextWidth();
 
-	virtual	void				InvalidateLayout(bool descendants = false);
-
 	virtual	BSize				MinSize();
 	virtual	BSize				MaxSize();
 	virtual	BSize				PreferredSize();
 
+protected:
+	virtual	void				LayoutInvalidated(bool descendants);
+
 private:
 			void				_DrawBlockThumb();
 			void				_DrawTriangleThumb();

headers/os/interface/TextControl.h

@@ -88,12 +88,11 @@ public:
 	virtual	BSize				MaxSize();
 	virtual	BSize				PreferredSize();
 
-	virtual	void				InvalidateLayout(bool descendants = false);
-
 			BLayoutItem*		CreateLabelLayoutItem();
 			BLayoutItem*		CreateTextViewLayoutItem();
 
 protected:
+	virtual	void				LayoutInvalidated(bool descendants);
 	virtual	void				DoLayout();
 
 private:

headers/os/interface/TextView.h

@@ -220,9 +220,8 @@ public:
 	virtual	void				GetHeightForWidth(float width, float* min,
 									float* max, float* preferred);
 
-	virtual	void				InvalidateLayout(bool descendants = false);
-
 protected:
+	virtual	void				LayoutInvalidated(bool descendants);
 	virtual	void				DoLayout();
 
 public: