X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fwwindow.C;h=5dfa3586020b56cefe0b7bc1c13c53f557cb63a2;hp=4f522f3179f099de3ee2622836771b6a3534a6eb;hb=ddfda6a8cc59bda4dc734973c1c5fecaa31ea487;hpb=7fd85fb66168f6b518c5f2d73e04036e87faa0e1

diff --git a/cinelerra-5.1/cinelerra/wwindow.C b/cinelerra-5.1/cinelerra/wwindow.C
index 4f522f31..5dfa3586 100644
--- a/cinelerra-5.1/cinelerra/wwindow.C
+++ b/cinelerra-5.1/cinelerra/wwindow.C
@@ -32,6 +32,7 @@ WWindow::WWindow(MWindow *mwindow)
 {
 	this->mwindow = mwindow;
 	this->result = 0;
+	this->gui = 0;
 }
 
 WWindow::~WWindow()
@@ -59,7 +60,7 @@ BC_Window* WWindow::new_gui()
 	BC_DisplayInfo display_info;
 	int x = display_info.get_abs_cursor_x();
 	int y = display_info.get_abs_cursor_y();
-	WWindowGUI *gui = new WWindowGUI(this, x, y);
+	gui = new WWindowGUI(this, x, y);
 	gui->create_objects();
 	return gui;
 }
@@ -72,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;
 }
@@ -80,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();
 }