projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some FTBFS issues when compiling with GCC 4.3
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
mod_palette
/
dock_paledit.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
index
fa1efc5
..
0109157
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file d
ialog_palette
.cpp
+/*! \file d
ock_paledit
.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: dock_paledit.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-44,6
+44,8
@@
#include "../app.h"
#include "../dialog_color.h"
#include "../app.h"
#include "../dialog_color.h"
+#include "../general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-119,7
+121,6
@@
Dock_PalEdit::Dock_PalEdit():
table(2,2,false)
{
action_group=Gtk::ActionGroup::create();
table(2,2,false)
{
action_group=Gtk::ActionGroup::create();
- DEBUGPOINT();
action_group->add(Gtk::Action::create(
"palette-add-color",
Gtk::StockID("gtk-add"),
action_group->add(Gtk::Action::create(
"palette-add-color",
Gtk::StockID("gtk-add"),
@@
-188,6
+189,7
@@
void
Dock_PalEdit::show_menu(int i)
{
Gtk::Menu* menu(manage(new Gtk::Menu()));
Dock_PalEdit::show_menu(int i)
{
Gtk::Menu* menu(manage(new Gtk::Menu()));
+ menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-select-color"),
sigc::bind(
menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-select-color"),
sigc::bind(