Window size fix by Auria. For now we simply check for any error during window...

Window size fix by Auria. For now we simply check for any error during window creation and bail out safely. This avoids uncontrolled crashes of the app and may be handled by the app logic somehow.
Reordered some of the device attributes and ensured initialization of all values.

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

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.h

@@ -228,18 +228,18 @@ namespace irr
 		NSWindow *Window;
 		CGLContextObj CGLContext;
 		NSOpenGLContext *OGLContext;
-		int	                DeviceWidth,
-		                    DeviceHeight;
-		std::map<int,int>	KeyCodes;
-		int                 ScreenWidth,
-		                    ScreenHeight;
-		bool                IsActive;
 		NSBitmapImageRep *SoftwareDriverTarget;
-		bool                IsSoftwareRenderer,
-		                    IsShiftDown,
-		                    IsControlDown,
-		                    IsResizable;
+		std::map<int,int> KeyCodes;
+		int DeviceWidth;
+		int DeviceHeight;
+		int ScreenWidth;
+		int ScreenHeight;
 		u32 MouseButtonStates;
+		bool IsActive;
+		bool IsSoftwareRenderer;
+		bool IsShiftDown;
+		bool IsControlDown;
+		bool IsResizable;
 	};
 
 

source/Irrlicht/MacOSX/CIrrDeviceMacOSX.mm

@@ -472,9 +472,11 @@ namespace irr
 {
 //! constructor
 CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
-	: CIrrDeviceStub(param), Window(NULL), IsActive(true), OGLContext(NULL), CGLContext(NULL),
-	SoftwareDriverTarget(0), IsSoftwareRenderer(false), IsResizable(false),
-	IsShiftDown(false), IsControlDown(false), MouseButtonStates(0)
+	: CIrrDeviceStub(param), Window(NULL), CGLContext(NULL), OGLContext(NULL),
+	SoftwareDriverTarget(0), DeviceWidth(0), DeviceHeight(0),
+	ScreenWidth(0), ScreenHeight(0), MouseButtonStates(0),
+	IsActive(true), IsSoftwareRenderer(false),
+	IsShiftDown(false), IsControlDown(false), IsResizable(false)
 {
 	struct utsname name;
 	NSString *path;
@@ -506,14 +508,16 @@ CIrrDeviceMacOSX::CIrrDeviceMacOSX(const SIrrlichtCreationParameters& param)
 	os::Printer::log(name.version,ELL_INFORMATION);
 
 	initKeycodes();
+	bool success = true;
 	if (CreationParams.DriverType != video::EDT_NULL)
-		createWindow();
+		success = createWindow();
+	// in case of failure, one can check VideoDriver for initialization
+	if (!success)
+		return;
 
 	setResizable(false);
-
 	CursorControl = new CCursorControl(CreationParams.WindowSize, this);
 	createDriver();
-
 	createGUIAndScene();
 }
 
@@ -592,6 +596,10 @@ bool CIrrDeviceMacOSX::createWindow()
 
 	VideoModeList.setDesktop(CreationParams.Bits, core::dimension2d<u32>(ScreenWidth, ScreenHeight));
 
+	// we need to check where the exceptions may happen and work at them
+	// for now we will just catch them to be able to avoid an app exit
+	@try
+	{
 		if (!CreationParams.Fullscreen)
 		{
 			if(!CreationParams.WindowId) //create another window when WindowId is null
@@ -757,6 +765,12 @@ bool CIrrDeviceMacOSX::createWindow()
 				}
 			}
 		}
+	}
+	@catch (NSException *exception)
+	{
+		// FIXME: cleanup may be needed here
+		result = false;
+	}
 
 	if (result)
 	{