From 130402bc9f153e47692f6596253689fdd1b8d3dd Mon Sep 17 00:00:00 2001
From: ondrej <ondrej@lazarus-ide.org>
Date: Tue, 1 Mar 2016 02:58:44 +0000
Subject: [PATCH] win32: simplify r51761 #d1d7473d27

git-svn-id: trunk@51762 -
---
 lcl/interfaces/win32/win32callback.inc | 1 -
 lcl/interfaces/win32/win32int.pp       | 2 --
 lcl/interfaces/win32/win32object.inc   | 5 +----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lcl/interfaces/win32/win32callback.inc b/lcl/interfaces/win32/win32callback.inc
index bb765d9c22..8d4d184b71 100644
--- a/lcl/interfaces/win32/win32callback.inc
+++ b/lcl/interfaces/win32/win32callback.inc
@@ -925,7 +925,6 @@ begin
   else
   if Assigned(lWinControl) and (lWinControl = Application.MainForm) then
   begin
-    Win32WidgetSet.FLastMainFormState := Application.MainForm.WindowState;
     PLMsg^.Result := Windows.DefWindowProc(Window, WM_SYSCOMMAND, WParam, LParam);
     WinProcess := False;
     Application.IntfAppMinimize;
diff --git a/lcl/interfaces/win32/win32int.pp b/lcl/interfaces/win32/win32int.pp
index 4422518bf5..574608ac60 100644
--- a/lcl/interfaces/win32/win32int.pp
+++ b/lcl/interfaces/win32/win32int.pp
@@ -134,8 +134,6 @@ type
     FOnAsyncSocketMsg: TSocketEvent;
     FDotsPatternBitmap: HBitmap;
 
-    FLastMainFormState: TWindowState;
-
     function GetDotsPatternBitmap: HBitmap;
 
     { event handler helper functions }
diff --git a/lcl/interfaces/win32/win32object.inc b/lcl/interfaces/win32/win32object.inc
index 4541613bf4..0a42070410 100644
--- a/lcl/interfaces/win32/win32object.inc
+++ b/lcl/interfaces/win32/win32object.inc
@@ -173,7 +173,6 @@ begin
   and Assigned(Application.MainForm) and Application.MainForm.HandleAllocated then
   begin
     HidePopups(Application.MainFormHandle);
-    FLastMainFormState := Application.MainForm.WindowState;
     Application.MainForm.WindowState := wsMinimized;
   end
   else
@@ -199,8 +198,6 @@ end;
   Restore minimized whole application from taskbar
  ------------------------------------------------------------------------------}
 procedure TWin32WidgetSet.AppRestore;
-const
-  SWSHOW: array[TWindowState] of Cardinal = (SW_SHOWNORMAL, SW_SHOWMINIMIZED, SW_SHOWMAXIMIZED, SW_SHOWMAXIMIZED);
 var
   AForm: TCustomForm;
   i: Integer;
@@ -209,7 +206,7 @@ begin
   if Assigned(Application) and Application.MainFormOnTaskBar
   and Assigned(Application.MainForm) and Application.MainForm.HandleAllocated then
   begin
-    ShowWindow(Application.MainForm.Handle, SWSHOW[FLastMainFormState]);
+    ShowWindow(Application.MainForm.Handle, SW_RESTORE);
     RestorePopups;
     if (Screen.ActiveControl<>nil) and Screen.ActiveControl.HandleAllocated then
       SetFocus(Screen.ActiveControl.Handle);