X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fwwindow.C;h=5dfa3586020b56cefe0b7bc1c13c53f557cb63a2;hb=2fba7eab40198b35d9edb20c16bcc1b8c262f7a2;hp=8bbc8352cf9a5ec33c4b1bcdbf7d2f2b1969e8b5;hpb=a64e7d16c44bba0d137936227fc55871bb26c903;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/wwindow.C b/cinelerra-5.1/cinelerra/wwindow.C
index 8bbc8352..5dfa3586 100644
--- a/cinelerra-5.1/cinelerra/wwindow.C
+++ b/cinelerra-5.1/cinelerra/wwindow.C
@@ -73,7 +73,8 @@ int WWindow::wait_result()
 }
 
 WWindowGUI::WWindowGUI(WWindow *thread, int x, int y)
- : BC_Window(_(PROGRAM_NAME ": Warning"), x, y, 640, 100, 640, 100, 0, 0, 1)
+ : BC_Window(_(PROGRAM_NAME ": Warning"), x, y,
+		xS(640), yS(100), xS(640), yS(100), 0, 0, 1)
 {
 	this->thread = thread;
 }
@@ -81,14 +82,16 @@ WWindowGUI::WWindowGUI(WWindow *thread, int x, int y)
 void WWindowGUI::create_objects()
 {
 	lock_window("WWindowGUI::create_objects");
-	int x = 10, y = 10;
-	add_subwindow(new BC_TextBox(x, y, get_w()-50, 3, thread->warn_text));
-	y = get_h() - 30;
-	add_subwindow(new WDisable(this, x, y));
-	y = get_h() - BC_CancelButton::calculate_h() - 10;
-	x = get_w() - BC_CancelButton::calculate_w() - 10;
+	int x = xS(10), y = yS(10);
+	add_subwindow(new BC_TextBox(x, y, get_w()-xS(50), 3, thread->warn_text));
+	y = get_h() - yS(30);
+	if( thread->do_warning )
+		add_subwindow(new WDisable(this, x, y));
+	y = get_h() - BC_CancelButton::calculate_h() - yS(10);
+	x = get_w() - BC_CancelButton::calculate_w() - xS(10);
 	add_subwindow(new BC_CancelButton(x, y));
 	show_window();
+	raise_window();
 	unlock_window();
 }