From e15e92b5838b06dc2835a7bff13292b0cc93a66f Mon Sep 17 00:00:00 2001
From: Camilla Berglund <elmindreda@elmindreda.org>
Date: Tue, 11 Sep 2012 23:56:44 +0200
Subject: [PATCH] Fixed function grouping.

---
 src/window.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/window.c b/src/window.c
index d4f063f5..b46065a7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -646,10 +646,10 @@ GLFWAPI void glfwIconifyWindow(GLFWwindow handle)
 
 
 //========================================================================
-// Window show
+// Window un-iconification
 //========================================================================
 
-GLFWAPI void glfwShowWindow(GLFWwindow handle)
+GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
@@ -659,18 +659,21 @@ GLFWAPI void glfwShowWindow(GLFWwindow handle)
         return;
     }
 
-    if (window->mode == GLFW_FULLSCREEN)
+    if (!window->iconified)
         return;
 
-    _glfwPlatformShowWindow(window);
+    _glfwPlatformRestoreWindow(window);
+
+    if (window->mode == GLFW_FULLSCREEN)
+        _glfwPlatformRefreshWindowParams(window);
 }
 
 
 //========================================================================
-// Window hide
+// Window show
 //========================================================================
 
-GLFWAPI void glfwHideWindow(GLFWwindow handle)
+GLFWAPI void glfwShowWindow(GLFWwindow handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
@@ -683,15 +686,15 @@ GLFWAPI void glfwHideWindow(GLFWwindow handle)
     if (window->mode == GLFW_FULLSCREEN)
         return;
 
-    _glfwPlatformHideWindow(window);
+    _glfwPlatformShowWindow(window);
 }
 
 
 //========================================================================
-// Window un-iconification
+// Window hide
 //========================================================================
 
-GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
+GLFWAPI void glfwHideWindow(GLFWwindow handle)
 {
     _GLFWwindow* window = (_GLFWwindow*) handle;
 
@@ -701,13 +704,10 @@ GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
         return;
     }
 
-    if (!window->iconified)
+    if (window->mode == GLFW_FULLSCREEN)
         return;
 
-    _glfwPlatformRestoreWindow(window);
-
-    if (window->mode == GLFW_FULLSCREEN)
-        _glfwPlatformRefreshWindowParams(window);
+    _glfwPlatformHideWindow(window);
 }