projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mask fade/feather rounding problem, mask mode sense err, add mask
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
guicast
/
bcmenuitem.C
diff --git
a/cinelerra-5.1/guicast/bcmenuitem.C
b/cinelerra-5.1/guicast/bcmenuitem.C
index 2c4469e4cf6a9e0a90c6fb7c5ef54b0abd390453..1e9399b1396c62ad55f3d08f0e3cad85c4a51f9a 100644
(file)
--- a/
cinelerra-5.1/guicast/bcmenuitem.C
+++ b/
cinelerra-5.1/guicast/bcmenuitem.C
@@
-29,6
+29,7
@@
#include "bcsignals.h"
#include "bcwindowbase.h"
#include "bccolors.h"
#include "bcsignals.h"
#include "bcwindowbase.h"
#include "bccolors.h"
+#include "cstrdup.h"
#include <string.h>
#include <string.h>
@@
-44,6
+45,8
@@
BC_MenuItem::BC_MenuItem(const char *text, const char *hotkey_text, int hotkey)
{
BC_MenuItem::BC_MenuItem(const char *text, const char *hotkey_text, int hotkey)
{
+ this->text = 0;
+ this->hotkey_text = 0;
reset();
if(text) set_text(text);
reset();
if(text) set_text(text);
@@
-74,10
+77,8
@@
BC_MenuItem::~BC_MenuItem()
void BC_MenuItem::reset()
{
void BC_MenuItem::reset()
{
- text = new char[1];
- hotkey_text = new char[1];
- text[0] = 0;
- hotkey_text[0] = 0;
+ set_text("");
+ set_hotkey_text("");
icon = 0;
}
icon = 0;
}
@@
-112,16
+113,14
@@
BC_Pixmap* BC_MenuItem::get_icon()
void BC_MenuItem::set_text(const char *text)
{
void BC_MenuItem::set_text(const char *text)
{
- if(this->text) delete [] this->text;
- this->text = new char[strlen(text) + 1];
- strcpy(this->text, text);
+ delete [] this->text;
+ this->text = cstrdup(text);
}
void BC_MenuItem::set_hotkey_text(const char *text)
{
}
void BC_MenuItem::set_hotkey_text(const char *text)
{
- if(this->hotkey_text) delete [] this->hotkey_text;
- this->hotkey_text = new char[strlen(text) + 1];
- strcpy(this->hotkey_text, text);
+ delete [] this->hotkey_text;
+ this->hotkey_text = cstrdup(text);
}
int BC_MenuItem::deactivate_submenus(BC_MenuPopup *exclude)
}
int BC_MenuItem::deactivate_submenus(BC_MenuPopup *exclude)