From 6d3948c2cf2c17975b6ad1c381a6311143d8096d Mon Sep 17 00:00:00 2001
From: Fred Kiefer <fredkiefer@gmx.de>
Date: Fri, 17 Oct 2008 15:22:41 +0000
Subject: [PATCH] Remove unused parameters for rect conversion on windows.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@26926 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                     | 7 +++++++
 Headers/win32/WIN32Geometry.h | 4 ++--
 Source/win32/WIN32Server.m    | 7 +++----
 Source/win32/w32_movesize.m   | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc74f50..a8af7d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-17 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/win32/WIN32Geometry.h (MSScreenRectToGS, GSScreenRectToMS),
+	* Source/win32/WIN32Server.m,
+	* Source/win32/w32_movesize.m:
+	Remove unused parameters from these functions and adjust callers.
+	
 2008-10-17 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/win32/WIN32Server.h,
diff --git a/Headers/win32/WIN32Geometry.h b/Headers/win32/WIN32Geometry.h
index 86bbd61..4f26f53 100644
--- a/Headers/win32/WIN32Geometry.h
+++ b/Headers/win32/WIN32Geometry.h
@@ -142,7 +142,7 @@ NSPoint MSScreenPointToGS(int x, int y)
 }
 
 static inline
-NSRect MSScreenRectToGS(RECT r, unsigned int styleMask, WIN32Server *self)
+NSRect MSScreenRectToGS(RECT r)
 {
   NSRect r1;
   int screen_height = GetSystemMetrics(SM_CYSCREEN);
@@ -167,7 +167,7 @@ POINT GSScreenPointToMS(NSPoint p)
 }
 
 static inline
-RECT GSScreenRectToMS(NSRect r, unsigned int styleMask, WIN32Server *self)
+RECT GSScreenRectToMS(NSRect r)
 {
   RECT r1;
   int screen_height = GetSystemMetrics(SM_CYSCREEN);
diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m
index 03444e9..ddf147b 100644
--- a/Source/win32/WIN32Server.m
+++ b/Source/win32/WIN32Server.m
@@ -861,7 +861,7 @@ NSLog(@"Callback");
   wstyle = [self windowStyleForGSStyle: style];
   estyle = [self exwindowStyleForGSStyle: style];
 
-  r = GSScreenRectToMS(frame, style, self);
+  r = GSScreenRectToMS(frame);
 
   NSDebugLLog(@"WTrace", @"window: %@ : %d : %d : %d", NSStringFromRect(frame), 
               type, style, screen);
@@ -1216,11 +1216,10 @@ NSLog(@"Callback");
   RECT r;
   RECT r2;
   WIN_INTERN *win = (WIN_INTERN *)GetWindowLong((HWND)winNum, GWL_USERDATA);
-  NSWindow *window = GSWindowWithNumber(winNum);
 
   NSDebugLLog(@"WTrace", @"placewindow: %@ : %d", NSStringFromRect(frame), 
               winNum);
-  r = GSScreenRectToMS(frame, [window styleMask], self);
+  r = GSScreenRectToMS(frame);
   GetWindowRect((HWND)winNum, &r2);
 
   SetWindowPos((HWND)winNum, NULL, 
@@ -1263,7 +1262,7 @@ NSLog(@"Callback");
   NSWindow *window = GSWindowWithNumber(winNum);
 
   GetWindowRect((HWND)winNum, &r);
-  return MSScreenRectToGS(r, [window styleMask], self);
+  return MSScreenRectToGS(r);
 }
 
 - (void) setwindowlevel: (int) level : (int) winNum
diff --git a/Source/win32/w32_movesize.m b/Source/win32/w32_movesize.m
index d3c5391..37b2fc9 100644
--- a/Source/win32/w32_movesize.m
+++ b/Source/win32/w32_movesize.m
@@ -39,7 +39,7 @@
   NSEvent *ev = nil;
 
   GetWindowRect(hwnd, &r);
-  rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self);
+  rect = MSScreenRectToGS(r);
   eventLocation = rect.origin;
         
   ev = [NSEvent otherEventWithType: NSAppKitDefined
@@ -99,7 +99,7 @@
           NSEvent *ev =nil;
   
           GetWindowRect(hwnd, &r);
-          rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self);
+          rect = MSScreenRectToGS(r);
           eventLocation = rect.origin;
 
           // make event
@@ -149,7 +149,7 @@
       drect=newRects->rgrc[1];
 
         //create a size event and send it to the window
-        rect = MSScreenRectToGS(drect, [EVENT_WINDOW(hwnd) styleMask], self);
+        rect = MSScreenRectToGS(drect);
         eventLocation = rect.origin;
 
         // make event