projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated towards 0.61.09 release
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
mod_palette
/
mod_palette.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
b/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
index
026342c
..
53d5fc5
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp
@@
-2,7
+2,7
@@
/*! \file mod_palette.cpp
** \brief Template File
**
/*! \file mod_palette.cpp
** \brief Template File
**
-** $Id
: mod_palette.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
@@
-36,6
+36,8
@@
#include "../app.h"
#include "../dockmanager.h"
#include "../app.h"
#include "../dockmanager.h"
+#include "../general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-59,8
+61,8
@@
studio::ModPalette::start_vfunc()
dock_pal_edit=new Dock_PalEdit();
App::get_dock_manager()->register_dockable(*dock_pal_edit);
dock_pal_edit=new Dock_PalEdit();
App::get_dock_manager()->register_dockable(*dock_pal_edit);
- dock_pal_browse=new Dock_PalBrowse();
- App::get_dock_manager()->register_dockable(*dock_pal_browse);
+
//
dock_pal_browse=new Dock_PalBrowse();
+
//
App::get_dock_manager()->register_dockable(*dock_pal_browse);
return true;
}
return true;
}
@@
-68,11
+70,11
@@
studio::ModPalette::start_vfunc()
bool
studio::ModPalette::stop_vfunc()
{
bool
studio::ModPalette::stop_vfunc()
{
- App::get_dock_manager()->unregister_dockable(*dock_pal_browse);
+
//
App::get_dock_manager()->unregister_dockable(*dock_pal_browse);
App::get_dock_manager()->unregister_dockable(*dock_pal_edit);
delete dock_pal_edit;
App::get_dock_manager()->unregister_dockable(*dock_pal_edit);
delete dock_pal_edit;
- delete dock_pal_browse;
+
//
delete dock_pal_browse;
return true;
}
return true;
}