X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Feditpopup.C;h=9dccdd06a85c70df923ea29b5029ac8e5401f578;hp=2f130edecf8f4f3f08db2a5dd1de3b5f810c40c1;hb=21c2e6b36d6a96c2f662a89459d607b5a387f4eb;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/editpopup.C b/cinelerra-5.1/cinelerra/editpopup.C
index 2f130ede..9dccdd06 100644
--- a/cinelerra-5.1/cinelerra/editpopup.C
+++ b/cinelerra-5.1/cinelerra/editpopup.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include "edit.h"
@@ -35,10 +35,10 @@
 #include <string.h>
 
 EditPopup::EditPopup(MWindow *mwindow, MWindowGUI *gui)
- : BC_PopupMenu(0, 
-		0, 
-		0, 
-		"", 
+ : BC_PopupMenu(0,
+		0,
+		0,
+		"",
 		0)
 {
 	this->mwindow = mwindow;
@@ -73,10 +73,8 @@ int EditPopup::update(Track *track, Edit *edit)
 	else
 	if(track->data_type == TRACK_AUDIO && resize_option)
 	{
-		remove_item(resize_option);
-		remove_item(matchsize_option);
-		resize_option = 0;
-		matchsize_option = 0;
+		del_item(resize_option);     resize_option = 0;
+		del_item(matchsize_option);  matchsize_option = 0;
 	}
 	return 0;
 }
@@ -105,7 +103,7 @@ EditAttachEffect::~EditAttachEffect()
 int EditAttachEffect::handle_event()
 {
 	dialog_thread->start_window(popup->track,
-		0, 
+		0,
 		_(PROGRAM_NAME ": Attach Effect"),
 		0,
 		popup->track->data_type);
@@ -328,7 +326,7 @@ void EditPopupTitleWindow::create_objects()
 }
 
 
-EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window, 
+EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window,
 	MWindow *mwindow, int x, int y)
  : BC_TextBox(x, y, 250, 1, (char*)(window->edt ? window->edt->user_title : ""))
 {
@@ -336,10 +334,10 @@ EditPopupTitleText::EditPopupTitleText (EditPopupTitleWindow *window,
 	this->mwindow = mwindow;
 }
 
-EditPopupTitleText::~EditPopupTitleText() 
-{ 
+EditPopupTitleText::~EditPopupTitleText()
+{
 }
- 
+
 int EditPopupTitleText::handle_event()
 {
 	return 1;