Merge branch 'next' of https://github.com/blackberry/GamePlay into next

gameplay/src/Form.cpp

@@ -657,8 +657,7 @@ bool Form::mouseEventInternal(Mouse::MouseEvent evt, int x, int y, int wheelDelt
 {
     bool eventConsumed = false;
 
-    size_t size = __forms.size();
-    for (size_t i = 0; i < size; ++i)
+    for (size_t i = 0; i < __forms.size(); ++i)
     {
         Form* form = __forms[i];
         GP_ASSERT(form);

gameplay/src/Game.h

@@ -475,10 +475,17 @@ public:
     /**
      * Is multi-touch mode enabled.
      *
-     * @return true is multi-touch is enabled.
+     * @return true if multi-touch is enabled.
      */
     inline bool isMultiTouch() const;
 
+    /**
+     * Whether this game is allowed to exit programmatically.
+     *
+     * @return true if a programmatic exit is allowed.
+     */
+    inline bool canExit() const;
+
     /**
      * Gets the current accelerometer values.
      *

gameplay/src/Game.inl

@@ -106,6 +106,11 @@ inline bool Game::isMultiTouch() const
     return Platform::isMultiTouch();
 }
 
+inline bool Game::canExit() const
+{
+    return Platform::canExit();
+}
+
 inline void Game::getAccelerometerValues(float* pitch, float* roll)
 {
     Platform::getAccelerometerValues(pitch, roll);

gameplay/src/Platform.h

@@ -55,6 +55,14 @@ public:
      * This function is called automatically when the game shutdown function is called
      */
     static void signalShutdown();
+
+    /**
+     * Indicates whether a programmatic exit is allowed on this platform.
+     * Some platforms (eg. iOS) do not allow apps to exit programmatically.
+     *
+     * @return whether a programmatic exit is allowed on this platform.
+     */
+    static bool canExit();
     
     /**
      * Gets the display width.

gameplay/src/PlatformAndroid.cpp

@@ -1037,6 +1037,11 @@ void Platform::signalShutdown()
 {
     // nothing to do  
 }
+
+bool Platform::canExit()
+{
+    return true;
+}
    
 unsigned int Platform::getDisplayWidth()
 {

gameplay/src/PlatformLinux.cpp

@@ -702,6 +702,11 @@ void Platform::signalShutdown()
 { 
     // nothing to do  
 }
+
+bool Platform::canExit()
+{
+    return true;
+}
     
 unsigned int Platform::getDisplayWidth()
 {

gameplay/src/PlatformMacOSX.mm

@@ -1397,6 +1397,11 @@ void Platform::signalShutdown()
     NSApplication* app = [NSApplication sharedApplication];
     [app performSelectorOnMainThread:@selector(terminate:) withObject:nil waitUntilDone:NO];
 }
+
+bool Platform::canExit()
+{
+    return true;
+}
     
 unsigned int Platform::getDisplayWidth()
 {

gameplay/src/PlatformQNX.cpp

@@ -1141,7 +1141,12 @@ void Platform::signalShutdown()
 {
     // nothing to do  
 }
-    
+
+bool Platform::canExit()
+{
+    return true;
+}
+
 unsigned int Platform::getDisplayWidth()
 {
     return __screenWindowSize[0];

gameplay/src/PlatformWin32.cpp

@@ -1083,6 +1083,11 @@ void Platform::signalShutdown()
     // nothing to do  
 }
 
+bool Platform::canExit()
+{
+    return true;
+}
+
 unsigned int Platform::getDisplayWidth()
 {
     static RECT rect;

gameplay/src/PlatformiOS.mm

@@ -453,7 +453,7 @@ int getKey(unichar keyCode);
         GL_ASSERT( glViewport(0, 0, framebufferWidth, framebufferHeight) );
         
         // Execute a single game frame
-        if (game && game->getState() == Game::RUNNING)
+        if (game)
             game->frame();
         
         // Present the contents of the color buffer
@@ -1094,6 +1094,11 @@ void Platform::signalShutdown()
     [__view stopUpdating];
     exit(0);
 }
+
+bool Platform::canExit()
+{
+    return false;
+}
 
 unsigned int Platform::getDisplayWidth()
 {