12 files changed, 18 insertions, 59 deletions

diff --git a/source/Asura.Editor/graphics/brush.h b/source/Asura.Editor/graphics/brush.h
index 5ffdba4..4290926 100644
--- a/source/Asura.Editor/graphics/brush.h
+++ b/source/Asura.Editor/graphics/brush.h
@@ -1,5 +1,5 @@
-#ifndef __ASURA_EDITOR_BRUSH_H__
-#define __ASURA_EDITOR_BRUSH_H__
+#ifndef _ASURA_EDITOR_BRUSH_H_
+#define _ASURA_EDITOR_BRUSH_H_
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/graphics/draw_info.cpp b/source/Asura.Editor/graphics/draw_info.cpp
deleted file mode 100644
index e69de29..0000000
--- a/source/Asura.Editor/graphics/draw_info.cpp
+++ /dev/null
diff --git a/source/Asura.Editor/graphics/draw_info.h b/source/Asura.Editor/graphics/draw_info.h
deleted file mode 100644
index 442b92d..0000000
--- a/source/Asura.Editor/graphics/draw_info.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ASURA_EDITOR_DRAW_INFO_H__
-#define __ASURA_EDITOR_DRAW_INFO_H__
-
-namespace AsuraEditor
-{
-	namespace Graphics
-	{
-
-
-
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/source/Asura.Editor/graphics/drawer.cpp b/source/Asura.Editor/graphics/drawer.cpp
index f2fca31..6482aeb 100644
--- a/source/Asura.Editor/graphics/drawer.cpp
+++ b/source/Asura.Editor/graphics/drawer.cpp
@@ -1,4 +1,4 @@
-#include "drawer.h"
+#include "Drawer.h"
 
 using namespace AEGraphics;
 
diff --git a/source/Asura.Editor/graphics/drawer.h b/source/Asura.Editor/graphics/drawer.h
index 85cc88a..638ce08 100644
--- a/source/Asura.Editor/graphics/drawer.h
+++ b/source/Asura.Editor/graphics/drawer.h
@@ -1,9 +1,9 @@
-#ifndef __ASURA_EDITOR_PAINTER_H__
-#define __ASURA_EDITOR_PAINTER_H__
+#ifndef _ASURA_EDITOR_PAINTER_H_
+#define _ASURA_EDITOR_PAINTER_H_
 
-#include <asura-utils/scripting/portable.hpp>
-#include <asura-utils/singleton.hpp>
-#include <asura-core/graphics/image.h>
+#include <asura-utils/Scripting/Portable.hpp>
+#include <asura-utils/Singleton.hpp>
+#include <asura-core/Graphics/Image.h>
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/graphics/pen.h b/source/Asura.Editor/graphics/pen.h
index 87a031c..b949d14 100644
--- a/source/Asura.Editor/graphics/pen.h
+++ b/source/Asura.Editor/graphics/pen.h
@@ -1,20 +1,7 @@
-#ifndef __ASURA_EDITOR_PEN_H__
-#define __ASURA_EDITOR_PEN_H__
+#ifndef _ASURA_EDITOR_PEN_H_
+#define _ASURA_EDITOR_PEN_H_
 
-namespace AsuraEditor
-{
-	namespace Graphics
-	{
 
-		///
-		/// ���ʣ�����ָ�����Ƶ�������ʽ
-		///
-		class Pen
-		{
 
-		};
-
-	}
-}
 
 #endif
\ No newline at end of file
diff --git a/source/Asura.Editor/graphics/shader.h b/source/Asura.Editor/graphics/shader.h
index 6f5a8cc..a3abec1 100644
--- a/source/Asura.Editor/graphics/shader.h
+++ b/source/Asura.Editor/graphics/shader.h
@@ -1,5 +1,5 @@
-#ifndef __ASURA_EDITOR_SHADER_H__
-#define __ASURA_EDITOR_SHADER_H__
+#ifndef _ASURA_EDITOR_SHADER_H_
+#define _ASURA_EDITOR_SHADER_H_
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/graphics/shaders/image.shader.h b/source/Asura.Editor/graphics/shaders/image.shader.h
index ee6be43..cbdd542 100644
--- a/source/Asura.Editor/graphics/shaders/image.shader.h
+++ b/source/Asura.Editor/graphics/shaders/image.shader.h
@@ -1,4 +1,4 @@
-#ifndef __ASURA_EDITOR_SHADER_H__
+#ifndef _ASURA_EDITOR_SHADER_H_
 #include "../shader.h"
 #endif
 
diff --git a/source/Asura.Editor/graphics/shaders/polygon.shader.h b/source/Asura.Editor/graphics/shaders/polygon.shader.h
index eed4f5a..a92e9a6 100644
--- a/source/Asura.Editor/graphics/shaders/polygon.shader.h
+++ b/source/Asura.Editor/graphics/shaders/polygon.shader.h
@@ -1,4 +1,4 @@
-#ifndef __ASURA_EDITOR_SHADER_H__
+#ifndef _ASURA_EDITOR_SHADER_H_
 #include "../shader.h"
 #endif
 
diff --git a/source/Asura.Editor/graphics/slider.cpp b/source/Asura.Editor/graphics/slider.cpp
deleted file mode 100644
index e69de29..0000000
--- a/source/Asura.Editor/graphics/slider.cpp
+++ /dev/null
diff --git a/source/Asura.Editor/graphics/slider.h b/source/Asura.Editor/graphics/slider.h
deleted file mode 100644
index 28ea77f..0000000
--- a/source/Asura.Editor/graphics/slider.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __ASURA_EDITOR_GUI_SLIDER_H__
-#define __ASURA_EDITOR_GUI_SLIDER_H__
-
-#include <asura-utils/classes.h>
-
-namespace_begin(AsuraEditor)
-
-void Slider();
-
-
-namespace_end
-
-
-#endif
diff --git a/source/Asura.Editor/graphics/style.h b/source/Asura.Editor/graphics/style.h
index fca3c37..b6ed2c5 100644
--- a/source/Asura.Editor/graphics/style.h
+++ b/source/Asura.Editor/graphics/style.h
@@ -1,11 +1,11 @@
-#ifndef __ASURA_EDITOR_GUI_STYLE_H__
-#define __ASURA_EDITOR_GUI_STYLE_H__
+#ifndef _ASURA_EDITOR_GUI_STYLE_H_
+#define _ASURA_EDITOR_GUI_STYLE_H_
 
-#include <asura-utils/classes.h>
+#include <asura-utils/Classes.h>
 
 namespace_begin(AsuraEditor)
 
-class Style
+class GUIStyle
 {
 
 };