X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fgwindowgui.C;h=d7f639ed35634282db8e33dddaf203437ceed653;hb=b402ed7f93de4c98e6651483eb8561cf1c37ec9a;hp=5cf353caff3068013edd24f29bd6f36accfa3775;hpb=361dbd9de4e6e4143ea0cac5daa89b30685a4c70;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/gwindowgui.C b/cinelerra-5.1/cinelerra/gwindowgui.C index 5cf353ca..d7f639ed 100644 --- a/cinelerra-5.1/cinelerra/gwindowgui.C +++ b/cinelerra-5.1/cinelerra/gwindowgui.C @@ -71,7 +71,7 @@ const char *GWindowGUI::other_text[NON_AUTOMATION_TOTAL] = N_("Assets"), N_("Titles"), N_("Transitions"), - N_("Plugin Autos") + N_("Plugin Keyframes") }; const char *GWindowGUI::auto_text[AUTOMATION_TOTAL] = @@ -190,8 +190,10 @@ GWindowColorButton::GWindowColorButton(GWindowToggle *auto_toggle, int x, int y, { this->auto_toggle = auto_toggle; this->color = 0; - for( int i=0; i<3; ++i ) - vframes[i] = new VFrame(w, w, BC_RGBA8888, -1); + for( int i=0; i<3; ++i ) { + vframes[i] = new VFrame(w, w, BC_RGBA8888); + vframes[i]->clear_frame(); + } } GWindowColorButton::~GWindowColorButton() @@ -248,7 +250,7 @@ void GWindowColorButton::update_gui(int color) } GWindowColorThread::GWindowColorThread(GWindowColorButton *color_button) - : ColorThread(0, color_button->auto_toggle->caption) + : ColorPicker(0, color_button->auto_toggle->caption) { this->color = 0; this->color_button = color_button; @@ -415,6 +417,7 @@ int GWindowGUI::translation_event() int GWindowGUI::close_event() { + delete color_thread; color_thread = 0; hide_window(); mwindow->session->show_gwindow = 0; unlock_window();