projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrades to scopewindow, add blurbox, bd.sh sed tab test, tweak clk2play over window...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
colorpicker.C
diff --git
a/cinelerra-5.1/cinelerra/colorpicker.C
b/cinelerra-5.1/cinelerra/colorpicker.C
index 26451d7086a68bf2ef968efe6e71113f8d4d6ac1..7c0a38d0d946fa8364b5e0c84c25ed442d2110e2 100644
(file)
--- a/
cinelerra-5.1/cinelerra/colorpicker.C
+++ b/
cinelerra-5.1/cinelerra/colorpicker.C
@@
-86,6
+86,7
@@
BC_Window* ColorPicker::new_gui()
if( x < 0 ) x = 0;
if( y < 0 ) y = 0;
ColorWindow *window = new ColorWindow(this, x, y, w, h, window_title);
if( x < 0 ) x = 0;
if( y < 0 ) y = 0;
ColorWindow *window = new ColorWindow(this, x, y, w, h, window_title);
+ window->create_objects();
window->start_selection(color, !do_alpha ? -1 : alpha, ok_cancel);
return window;
}
window->start_selection(color, !do_alpha ? -1 : alpha, ok_cancel);
return window;
}
@@
-114,6
+115,13
@@
ColorWindow::~ColorWindow()
{
}
{
}
+void ColorWindow::create_objects()
+{
+ BC_WindowBase::create_objects();
+ ColorGUI::create_objects();
+ thread->create_objects(this);
+}
+
void ColorWindow::update_gui(int color, int alpha)
{
lock_window("ColorWindow::update_gui");
void ColorWindow::update_gui(int color, int alpha)
{
lock_window("ColorWindow::update_gui");