Changed buttons and TextView back to being children of the MasterView so that the Archive() BMessage matches Be's version. Changed when MasterView is added as child of the Alert window to fix the "out-of-alignment" issue.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11134 a95241bf-73f2-0310-859d-f6bbb57e9c96
2005-01-29 19:12:01 +00:00
parent 634f747e29
commit 9d9ef27273
1 changed files with 3 additions and 3 deletions
@@ -470,6 +470,7 @@ void BAlert::InitObject(const char* text, const char* button0,
 	
 		// Set up the "_master_" view
 		TAlertView* MasterView = new TAlertView(Bounds());
+		AddChild(MasterView);
 		MasterView->SetBitmap(InitIcon());
 	
 		// Set up the buttons
@@ -522,7 +523,7 @@ void BAlert::InitObject(const char* text, const char* button0,
 		// in AttachedToWindow()
 		for (int i = 0; i < buttonCount; ++i)
 		{
-			AddChild(fButtons[i]);
+			MasterView->AddChild(fButtons[i]);
 		}

 		for (int i = buttonCount - 1; i >= 0; --i)
@@ -617,8 +618,7 @@ void BAlert::InitObject(const char* text, const char* button0,
 		fTextView = new BTextView(TextViewRect, "_tv_",
 								  TextViewRect,
 								  B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW);
- 		AddChild(MasterView);
- 		AddChild(fTextView);
+ 		MasterView->AddChild(fTextView);
 		
 		fTextView->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 		fTextView->SetText(text, strlen(text));