fixed gui editor v7 solution file, corrected CFontTool #defines for windows

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@713 dfc29bdd-3216-0410-991c-e03cc46cb475

tools/GUIEditor/GUI Editor_v7.vcproj

@@ -120,6 +120,9 @@
 	<Files>
 		<Filter
 			Name="gui">
+			<File
+				RelativePath=".\CGUIDummyEditorStub.h">
+			</File>
 			<File
 				RelativePath=".\CGUIEditFactory.cpp">
 			</File>
@@ -138,36 +141,49 @@
 			<File
 				RelativePath=".\CGUIEditWorkspace.h">
 			</File>
+			<File
+				RelativePath=".\CGUIPanel.cpp">
+			</File>
+			<File
+				RelativePath=".\CGUIPanel.h">
+			</File>
+			<File
+				RelativePath=".\CGUITextureAttribute.h">
+			</File>
+			<File
+				RelativePath=".\CGUITextureCacheBrowser.cpp">
+			</File>
+			<File
+				RelativePath=".\CGUITextureCacheBrowser.h">
+			</File>
+			<File
+				RelativePath=".\CMemoryReadWriteFile.cpp">
+			</File>
+			<File
+				RelativePath=".\CMemoryReadWriteFile.h">
+			</File>
 			<Filter
-				Name="GUIAttributes"
-				>
+				Name="GUIAttributes">
 				<File
-					RelativePath=".\CGUIAttribute.h"
-					>
+					RelativePath=".\CGUIAttribute.h">
 				</File>
 				<File
-					RelativePath=".\CGUIAttributeEditor.cpp"
-					>
+					RelativePath=".\CGUIAttributeEditor.cpp">
 				</File>
 				<File
-					RelativePath=".\CGUIAttributeEditor.h"
-					>
+					RelativePath=".\CGUIAttributeEditor.h">
 				</File>
 				<File
-					RelativePath=".\CGUIBoolAttribute.h"
-					>
+					RelativePath=".\CGUIBoolAttribute.h">
 				</File>
 				<File
-					RelativePath=".\CGUIColorAttribute.h"
-					>
+					RelativePath=".\CGUIColorAttribute.h">
 				</File>
 				<File
-					RelativePath=".\CGUIEnumAttribute.h"
-					>
+					RelativePath=".\CGUIEnumAttribute.h">
 				</File>
 				<File
-					RelativePath=".\CGUIStringAttribute.h"
-					>
+					RelativePath=".\CGUIStringAttribute.h">
 				</File>
 			</Filter>
 		</Filter>

tools/IrrFontTool/newFontTool/CFontTool.h

@@ -4,18 +4,18 @@
 
 #include "irrlicht.h"
 
-#ifdef _IRR_WINDOWS_
+#if defined(_IRR_WINDOWS_)
 	#ifdef _MBCS
 		#undef _MBCS
 	#endif
+
 	#define UNICODE
-	
 	#define _WIN32_WINNT 0x0500	
-
 	#include "windows.h"
-#endif
-#ifdef _IRR_COMPILE_WITH_X11_
-#include <X11/Xlib.h>
+#else
+	#ifdef _IRR_COMPILE_WITH_X11_
+	#include <X11/Xlib.h>
+	#endif
 #endif