projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
app.h
diff --git
a/synfig-studio/trunk/src/gtkmm/app.h
b/synfig-studio/trunk/src/gtkmm/app.h
index
d862795
..
a6d87cf
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/app.h
+++ b/
synfig-studio/trunk/src/gtkmm/app.h
@@
-28,7
+28,6
@@
/* === H E A D E R S ======================================================= */
/* === H E A D E R S ======================================================= */
-#include <sigc++/compatibility.h>
#include <sigc++/bind.h>
#include <gtkmm/main.h>
#include <sigc++/bind.h>
#include <gtkmm/main.h>
@@
-44,7
+43,7
@@
#include <gtkmm/uimanager.h>
#include <synfigapp/instance.h>
#include <gtkmm/uimanager.h>
#include <synfigapp/instance.h>
-#include "iconcontroler.h"
+#include "iconcontrol
l
er.h"
/* === M A C R O S ========================================================= */
/* === M A C R O S ========================================================= */
@@
-99,9
+98,9
@@
class IPC;
class Module;
class StateManager;
class Module;
class StateManager;
-class IconControler;
+class IconControl
l
er;
-class App : public Gtk::Main, private IconControler
+class App : public Gtk::Main, private IconControl
l
er
{
friend class Preferences;
friend class Dialog_Setup;
{
friend class Preferences;
friend class Dialog_Setup;