Fix dimension2du and getFileName signatures.

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

tools/GUIEditor/CGUIAttribute.h

@@ -117,7 +117,7 @@ namespace gui
 				if (y < (*it)->getRelativePosition().LowerRightCorner.Y)
 					y = (*it)->getRelativePosition().LowerRightCorner.Y;
 			}
-			setMinSize( core::dimension2di(0, y+5));
+			setMinSize( core::dimension2du(0, y+5));
 
 			updateAttrib(false);
 		}

tools/GUIEditor/CGUIDummyEditorStub.h

@@ -28,7 +28,7 @@ namespace gui
 			setDebugName("CGUIDummyEditorStub");
 			#endif
 
-			core::dimension2di d = Environment->getSkin()->getFont()->getDimension(L"A");
+			core::dimension2du d = Environment->getSkin()->getFont()->getDimension(L"A");
 			s32 h = d.Height / 2;
 			s32 w = d.Width / 2;
 

tools/GUIEditor/CGUIEditWindow.cpp

@@ -39,7 +39,7 @@ CGUIEditWindow::CGUIEditWindow(IGUIEnvironment* environment, core::rect<s32> rec
 	s32 th = skin->getSize(EGDS_WINDOW_BUTTON_WIDTH);
 
 	setRelativePosition(core::rect<s32>(50,50,250,500));
-	setMinSize(core::dimension2di(200,200));
+	setMinSize(core::dimension2du(200,200));
 
 	IGUITabControl *TabControl = environment->addTabControl(core::rect<s32>(1,th+5,199,449), this, false, true);
 	TabControl->setSubElement(true);

tools/GUIEditor/CGUITextureCacheBrowser.cpp

@@ -141,8 +141,8 @@ void CGUITextureCacheBrowser::updateImageList()
 			details += L"Unknown\n";
 		}
 
-		core::dimension2di osize = tex->getOriginalSize();
-		core::dimension2di size = tex->getOriginalSize();
+		core::dimension2du osize = tex->getOriginalSize();
+		core::dimension2du size = tex->getOriginalSize();
 
 		details += "Size: ";
 		details += size.Width;

tools/GUIEditor/CMemoryReadWriteFile.cpp

@@ -53,9 +53,9 @@ bool CMemoryReadWriteFile::seek(long finalPos, bool relativeMovement)
 
 }
 
-const c8* CMemoryReadWriteFile::getFileName() const
+const core::string<c16>& CMemoryReadWriteFile::getFileName() const
 {
-	return FileName.c_str();
+	return FileName;
 }
 
 long CMemoryReadWriteFile::getPos() const

tools/GUIEditor/CMemoryReadWriteFile.h

@@ -53,7 +53,7 @@ namespace io
 
 		//! Returns name of file.
 		//! \return Returns the file name as zero terminated character string.
-		virtual const c8* getFileName() const;
+		virtual const core::string<c16>& getFileName() const;
 
 		//! Returns file data as an array
 		core::array<c8>& getData();

tools/GUIEditor/main.cpp

@@ -37,7 +37,7 @@ int main()
 	}	
 
 
-	IrrlichtDevice *device =createDevice(driverType, core::dimension2d<s32>(800, 600));
+	IrrlichtDevice *device =createDevice(driverType, core::dimension2du(800, 600));
 	video::IVideoDriver* driver = device->getVideoDriver();
 	scene::ISceneManager* smgr = device->getSceneManager();
 	gui::IGUIEnvironment *env = device->getGUIEnvironment();