From 04f7c56179685473ef0380c3a24a9afda6afc0ca Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Sat, 14 Nov 2009 19:19:05 +0000
Subject: [PATCH] Some layer functions plugged to layer menu bar

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1185 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile  |  2 +-
 init.c    | 15 ++++++++-------
 special.c | 10 ----------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 2a04bee7..0b0a897f 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@ endif
 .PHONY : all debug release clean depend zip version force install uninstall
 
 # This is the list of the objects we want to build. Dependancies are built by "make depend" automatically.
-OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o  $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o $(OBJDIR)/factory.o $(PLATFORMOBJ) $(OBJDIR)/fileformats.o $(OBJDIR)/miscfileformats.o $(OBJDIR)/libraw2crtc.o $(OBJDIR)/brush_ops.o $(OBJDIR)/buttons_effects.o
+OBJ = $(OBJDIR)/main.o $(OBJDIR)/init.o $(OBJDIR)/graph.o $(OBJDIR)/sdlscreen.o  $(OBJDIR)/misc.o $(OBJDIR)/special.o $(OBJDIR)/buttons.o $(OBJDIR)/palette.o $(OBJDIR)/help.o $(OBJDIR)/operatio.o $(OBJDIR)/pages.o $(OBJDIR)/loadsave.o $(OBJDIR)/readline.o $(OBJDIR)/engine.o $(OBJDIR)/filesel.o $(OBJDIR)/op_c.o $(OBJDIR)/readini.o $(OBJDIR)/saveini.o $(OBJDIR)/shade.o $(OBJDIR)/keyboard.o $(OBJDIR)/io.o $(OBJDIR)/version.o $(OBJDIR)/text.o $(OBJDIR)/SFont.o $(OBJDIR)/setup.o $(OBJDIR)/pxsimple.o $(OBJDIR)/pxtall.o $(OBJDIR)/pxwide.o $(OBJDIR)/pxdouble.o $(OBJDIR)/pxtriple.o $(OBJDIR)/pxtall2.o $(OBJDIR)/pxwide2.o $(OBJDIR)/pxquad.o $(OBJDIR)/windows.o $(OBJDIR)/brush.o $(OBJDIR)/realpath.o $(OBJDIR)/mountlist.o $(OBJDIR)/input.o $(OBJDIR)/hotkeys.o $(OBJDIR)/transform.o $(OBJDIR)/pversion.o $(OBJDIR)/factory.o $(PLATFORMOBJ) $(OBJDIR)/fileformats.o $(OBJDIR)/miscfileformats.o $(OBJDIR)/libraw2crtc.o $(OBJDIR)/brush_ops.o $(OBJDIR)/buttons_effects.o $(OBJDIR)/layers.o 
 
 SKIN_FILES = skins/skin_classic.png skins/skin_modern.png skins/font_Classic.png skins/font_Fun.png
 
diff --git a/init.c b/init.c
index 63d58ac8..5be3924b 100644
--- a/init.c
+++ b/init.c
@@ -71,6 +71,7 @@
 #include "struct.h"
 #include "transform.h"
 #include "windows.h"
+#include "layers.h"
 
 char Gui_loading_error_message[512];
 
@@ -1239,49 +1240,49 @@ void Init_buttons(void)
                      0,0,
                      57,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_menu, Button_Layer_menu,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_COLOR,
                      58,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_color, Button_Layer_color,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_MERGE,
                      72,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_merge, Button_Layer_merge,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_ADD,
                      86,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_add, Button_Layer_add,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_REMOVE,
                      100,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_remove, Button_Layer_remove,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_UP,
                      114,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_up, Button_Layer_up,
                      Do_nothing,
                      FAMILY_TOOLBAR);
   Init_button(BUTTON_LAYER_DOWN,
                      128,0,
                      13,9,
                      BUTTON_SHAPE_RECTANGLE,
-                     Do_nothing, Do_nothing,
+                     Button_Layer_down, Button_Layer_down,
                      Do_nothing,
                      FAMILY_TOOLBAR);
 
diff --git a/special.c b/special.c
index e00ea456..eeb5778b 100644
--- a/special.c
+++ b/special.c
@@ -531,13 +531,3 @@ void Layer_activate(short layer, short side)
   Display_cursor();
 }
 
-void Special_add_layer()
-{
-
-
-}
-void Special_delete_layer()
-{
-
-
-}