Renamed setResizeable to setResizable (!)

Tidied the Xcode project some more and fixed compiling. Didn't implement CIrrDeviceOSX::minimizeWindow yet

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

changes.txt

@@ -2,7 +2,7 @@ Changes in 1.6
 
  - Added SGI RGB file reader by Gary Conway, for loading Silicon Graphics .rgb, .rgba, .sgi, .int and .inta textures
 
- - Renamed setResizeAble to setResizeable
+ - Renamed setResizeAble to setResizable
 
  - Added new device method minimizeWindow which minimizes the window (just as if the minimize button has been clicked).
 

source/Irrlicht/CImageLoaderRGB.h

@@ -182,21 +182,19 @@ private:
 
 	bool readHeader(io::IReadFile* file, rgbStruct* rgb) const;
 	void readRGBrow( u8 *buf, int y, int z, io::IReadFile* file, rgbStruct* rgb) const;
-	void convertLong(u32 *array, long length) const;
-	void convertShort(u16 *array, long length) const;
 	void processFile(rgbStruct *rgb, io::IReadFile *file) const;
 	bool checkFormat(io::IReadFile *file, rgbStruct *rgb) const;
 	bool readOffsetTables(io::IReadFile* file, rgbStruct *rgb) const;
 	void converttoARGB(u8* in, rgbStruct *rgb) const;
+	
+#ifndef __BIG_ENDIAN__
+	void convertLong(u32 *array, long length) const;
+	void convertShort(u16 *array, long length) const;
+#endif
 };
 
-
-
-
-
 } // end namespace video
 } // end namespace irr
 
-
-#endif
-#endif
+#endif // _IRR_COMPILE_WITH_RGB_LOADER_
+#endif // __C_IMAGE_LOADER_RGB_H_INCLUDED__

source/Irrlicht/CIrrDeviceConsole.cpp

@@ -406,8 +406,8 @@ void CIrrDeviceConsole::closeDevice()
 	IsDeviceRunning = false;
 }
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceConsole::setResizeable(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceConsole::setResizable(bool resize)
 {
 	// do nothing
 }

source/Irrlicht/CIrrDeviceConsole.h

@@ -75,8 +75,8 @@ namespace irr
 		//! notifies the device that it should close itself
 		virtual void closeDevice();
 
-		//! Sets if the window should be resizeable in windowed mode.
-		virtual void setResizeable(bool resize=false);
+		//! Sets if the window should be resizable in windowed mode.
+		virtual void setResizable(bool resize=false);
 
 		//! Minimizes the window.
 		virtual void minimizeWindow();

source/Irrlicht/CIrrDeviceLinux.cpp

@@ -1050,8 +1050,8 @@ video::ECOLOR_FORMAT CIrrDeviceLinux::getColorFormat() const
 }
 
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceLinux::setResizeable(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceLinux::setResizable(bool resize)
 {
 #ifdef _IRR_COMPILE_WITH_X11_
 	if (CreationParams.DriverType == video::EDT_NULL)

source/Irrlicht/CIrrDeviceLinux.h

@@ -87,8 +87,8 @@ namespace irr
 		//! supported by the gfx adapter.
 		video::IVideoModeList* getVideoModeList();
 
-		//! Sets if the window should be resizeable in windowed mode.
-		virtual void setResizeable(bool resize=false);
+		//! Sets if the window should be resizable in windowed mode.
+		virtual void setResizable(bool resize=false);
 
 		//! Minimizes the window.
 		virtual void minimizeWindow();

source/Irrlicht/CIrrDeviceSDL.cpp

@@ -45,7 +45,7 @@ CIrrDeviceSDL::CIrrDeviceSDL(const SIrrlichtCreationParameters& param)
 	Screen((SDL_Surface*)param.WindowId), SDL_Flags(SDL_HWSURFACE|SDL_ANYFORMAT),
 	MouseX(0), MouseY(0), MouseButtonStates(0),
 	Width(param.WindowSize.Width), Height(param.WindowSize.Height),
-	Close(0), Resizeable(false),
+	Close(0), Resizable(false),
 	WindowHasFocus(false), WindowMinimized(false)
 {
 	#ifdef _DEBUG
@@ -660,10 +660,10 @@ video::IVideoModeList* CIrrDeviceSDL::getVideoModeList()
 }
 
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceSDL::setResizeable(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceSDL::setResizable(bool resize)
 {
-	if (resize != Resizeable)
+	if (resize != Resizable)
 	{
 		if (resize)
 			SDL_Flags |= SDL_RESIZABLE;
@@ -672,7 +672,7 @@ void CIrrDeviceSDL::setResizeable(bool resize)
 		if (Screen)
 			SDL_FreeSurface(Screen);
 		Screen = SDL_SetVideoMode( Width, Height, CreationParams.Bits, SDL_Flags );
-		Resizeable = resize;
+		Resizable = resize;
 	}
 }
 

source/Irrlicht/CIrrDeviceSDL.h

@@ -64,8 +64,8 @@ namespace irr
 		//! \return Returns a pointer to a list with all video modes supported
 		video::IVideoModeList* getVideoModeList();
 
-		//! Sets if the window should be resizeable in windowed mode.
-		virtual void setResizeable(bool resize=false);
+		//! Sets if the window should be resizable in windowed mode.
+		virtual void setResizable(bool resize=false);
 
 		//! Minimizes the window.
 		virtual void minimizeWindow();
@@ -185,7 +185,7 @@ namespace irr
 		u32 Width, Height;
 
 		bool Close;
-		bool Resizeable;
+		bool Resizable;
 		bool WindowHasFocus;
 		bool WindowMinimized;
 

source/Irrlicht/CIrrDeviceWin32.cpp

@@ -892,8 +892,8 @@ void CIrrDeviceWin32::OnResized()
 	Resized = true;
 }
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceWin32::setResizeable(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceWin32::setResizable(bool resize)
 {
 	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
 		return;

source/Irrlicht/CIrrDeviceWin32.h

@@ -66,8 +66,8 @@ namespace irr
 		//! Notifies the device, that it has been resized
 		void OnResized();
 
-		//! Sets if the window should be resizeable in windowed mode.
-		virtual void setResizeable(bool resize=false);
+		//! Sets if the window should be resizable in windowed mode.
+		virtual void setResizable(bool resize=false);
 
 		//! Minimizes the window.
 		virtual void minimizeWindow();

source/Irrlicht/CIrrDeviceWinCE.cpp

@@ -741,8 +741,8 @@ void CIrrDeviceWinCE::OnResized()
 }
 
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceWinCE::setResizeable(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceWinCE::setResizable(bool resize)
 {
 	if (ExternalWindow || !getVideoDriver() || CreationParams.Fullscreen)
 		return;

source/Irrlicht/CIrrDeviceWinCE.h

@@ -66,8 +66,8 @@ namespace irr
 		//! Notifies the device, that it has been resized
 		void OnResized();
 
-		//! Sets if the window should be resizeable in windowed mode.
-		virtual void setResizeable(bool resize=false);
+		//! Sets if the window should be resizable in windowed mode.
+		virtual void setResizable(bool resize=false);
 
 		//! Minimizes the window.
 		virtual void minimizeWindow();

source/Irrlicht/MacOSX/AppDelegate.mm

@@ -52,7 +52,7 @@
 
 - (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
 {
-	if (_device->isResizeAble())
+	if (_device->isResizable())
 		return proposedFrameSize;
 	else
 		return [window frame].size;

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h

@@ -63,10 +63,13 @@ namespace irr
 		virtual void closeDevice();
 
 		//! Sets if the window should be resizable in windowed mode.
-		virtual void setResizeAble(bool resize);
+		virtual void setResizable(bool resize);
 		
 		//! Returns true if the window is resizable, false if not
-		virtual bool isResizeAble() const;
+		virtual bool isResizable() const;
+		
+		//! Minimizes the window if possible
+		virtual void minimizeWindow();
 
 		//! Activate any joysticks, and generate events for them.
 		virtual bool activateJoysticks(core::array<SJoystickInfo> & joystickInfo);
@@ -76,8 +79,8 @@ namespace irr
 		virtual video::IVideoModeList* getVideoModeList();
 
 		void flush();
-		void setMouseLocation(int x,int y);
-		void setResize(int width,int height);
+		void setMouseLocation(int x, int y);
+		void setResize(int width, int height);
 		void setCursorVisible(bool visible);
 
 	private:

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -369,7 +369,7 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 	if (CreationParams.DriverType != video::EDT_NULL)
 		createWindow();
 	
-	setResizeAble(false);
+	setResizable(false);
 	
 	CursorControl = new CCursorControl(CreationParams.WindowSize, this);
 	createDriver();
@@ -1085,17 +1085,21 @@ void CIrrDeviceMacOSX::initKeycodes()
 
 
 
-//! Sets if the window should be resizeable in windowed mode.
-void CIrrDeviceMacOSX::setResizeAble(bool resize)
+//! Sets if the window should be resizable in windowed mode.
+void CIrrDeviceMacOSX::setResizable(bool resize)
 {
 	IsResizable = resize;
 }
 	
-bool CIrrDeviceMacOSX::isResizeAble() const
+bool CIrrDeviceMacOSX::isResizable() const
 {
 	return IsResizable;
 }
-	
+
+void CIrrDeviceMacOSX::minimizeWindow()
+{
+	// todo: implement
+}
 
 bool CIrrDeviceMacOSX::present(video::IImage* surface, void* windowId, core::rect<s32>* src )
 {