mirror of
https://github.com/gnustep/libs-back.git
synced 2025-05-31 01:11:00 +00:00
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
This commit is contained in:
parent
7a19a2cd69
commit
6d3948c2cf
4 changed files with 15 additions and 9 deletions
|
@ -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>
|
2008-10-17 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
* Headers/win32/WIN32Server.h,
|
* Headers/win32/WIN32Server.h,
|
||||||
|
|
|
@ -142,7 +142,7 @@ NSPoint MSScreenPointToGS(int x, int y)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
NSRect MSScreenRectToGS(RECT r, unsigned int styleMask, WIN32Server *self)
|
NSRect MSScreenRectToGS(RECT r)
|
||||||
{
|
{
|
||||||
NSRect r1;
|
NSRect r1;
|
||||||
int screen_height = GetSystemMetrics(SM_CYSCREEN);
|
int screen_height = GetSystemMetrics(SM_CYSCREEN);
|
||||||
|
@ -167,7 +167,7 @@ POINT GSScreenPointToMS(NSPoint p)
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline
|
static inline
|
||||||
RECT GSScreenRectToMS(NSRect r, unsigned int styleMask, WIN32Server *self)
|
RECT GSScreenRectToMS(NSRect r)
|
||||||
{
|
{
|
||||||
RECT r1;
|
RECT r1;
|
||||||
int screen_height = GetSystemMetrics(SM_CYSCREEN);
|
int screen_height = GetSystemMetrics(SM_CYSCREEN);
|
||||||
|
|
|
@ -861,7 +861,7 @@ NSLog(@"Callback");
|
||||||
wstyle = [self windowStyleForGSStyle: style];
|
wstyle = [self windowStyleForGSStyle: style];
|
||||||
estyle = [self exwindowStyleForGSStyle: style];
|
estyle = [self exwindowStyleForGSStyle: style];
|
||||||
|
|
||||||
r = GSScreenRectToMS(frame, style, self);
|
r = GSScreenRectToMS(frame);
|
||||||
|
|
||||||
NSDebugLLog(@"WTrace", @"window: %@ : %d : %d : %d", NSStringFromRect(frame),
|
NSDebugLLog(@"WTrace", @"window: %@ : %d : %d : %d", NSStringFromRect(frame),
|
||||||
type, style, screen);
|
type, style, screen);
|
||||||
|
@ -1216,11 +1216,10 @@ NSLog(@"Callback");
|
||||||
RECT r;
|
RECT r;
|
||||||
RECT r2;
|
RECT r2;
|
||||||
WIN_INTERN *win = (WIN_INTERN *)GetWindowLong((HWND)winNum, GWL_USERDATA);
|
WIN_INTERN *win = (WIN_INTERN *)GetWindowLong((HWND)winNum, GWL_USERDATA);
|
||||||
NSWindow *window = GSWindowWithNumber(winNum);
|
|
||||||
|
|
||||||
NSDebugLLog(@"WTrace", @"placewindow: %@ : %d", NSStringFromRect(frame),
|
NSDebugLLog(@"WTrace", @"placewindow: %@ : %d", NSStringFromRect(frame),
|
||||||
winNum);
|
winNum);
|
||||||
r = GSScreenRectToMS(frame, [window styleMask], self);
|
r = GSScreenRectToMS(frame);
|
||||||
GetWindowRect((HWND)winNum, &r2);
|
GetWindowRect((HWND)winNum, &r2);
|
||||||
|
|
||||||
SetWindowPos((HWND)winNum, NULL,
|
SetWindowPos((HWND)winNum, NULL,
|
||||||
|
@ -1263,7 +1262,7 @@ NSLog(@"Callback");
|
||||||
NSWindow *window = GSWindowWithNumber(winNum);
|
NSWindow *window = GSWindowWithNumber(winNum);
|
||||||
|
|
||||||
GetWindowRect((HWND)winNum, &r);
|
GetWindowRect((HWND)winNum, &r);
|
||||||
return MSScreenRectToGS(r, [window styleMask], self);
|
return MSScreenRectToGS(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void) setwindowlevel: (int) level : (int) winNum
|
- (void) setwindowlevel: (int) level : (int) winNum
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
NSEvent *ev = nil;
|
NSEvent *ev = nil;
|
||||||
|
|
||||||
GetWindowRect(hwnd, &r);
|
GetWindowRect(hwnd, &r);
|
||||||
rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self);
|
rect = MSScreenRectToGS(r);
|
||||||
eventLocation = rect.origin;
|
eventLocation = rect.origin;
|
||||||
|
|
||||||
ev = [NSEvent otherEventWithType: NSAppKitDefined
|
ev = [NSEvent otherEventWithType: NSAppKitDefined
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
NSEvent *ev =nil;
|
NSEvent *ev =nil;
|
||||||
|
|
||||||
GetWindowRect(hwnd, &r);
|
GetWindowRect(hwnd, &r);
|
||||||
rect = MSScreenRectToGS(r, [EVENT_WINDOW(hwnd) styleMask], self);
|
rect = MSScreenRectToGS(r);
|
||||||
eventLocation = rect.origin;
|
eventLocation = rect.origin;
|
||||||
|
|
||||||
// make event
|
// make event
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
drect=newRects->rgrc[1];
|
drect=newRects->rgrc[1];
|
||||||
|
|
||||||
//create a size event and send it to the window
|
//create a size event and send it to the window
|
||||||
rect = MSScreenRectToGS(drect, [EVENT_WINDOW(hwnd) styleMask], self);
|
rect = MSScreenRectToGS(drect);
|
||||||
eventLocation = rect.origin;
|
eventLocation = rect.origin;
|
||||||
|
|
||||||
// make event
|
// make event
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue