More 64 bit updates for use of MSWindows HANDLE/WHnd representation

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40236 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-11-25 17:02:46 +00:00
parent 1f01a2e4b0
commit 155a17ec60
9 changed files with 13 additions and 13 deletions

View file

@ -127,7 +127,7 @@
action: (NSDragOperation)action
position: (NSPoint)eventLocation
timestamp: (NSTimeInterval)time
toWindow: (int)dWindowNumber;
toWindow: (NSInteger)dWindowNumber;
- (NSWindow*) windowAcceptingDnDunder: (NSPoint)mouseLocation
windowRef: (int*)mouseWindowRef;

View file

@ -53,7 +53,7 @@ this, either directly, or indirectly (by using the backend).
@interface GSWindowDecorationView : NSView
{
NSWindow *window; /* not retained */
int windowNumber;
NSInteger windowNumber;
NSRect contentRect;
int inputState;
BOOL documentEdited;
@ -82,7 +82,7 @@ this, either directly, or indirectly (by using the backend).
Called when the backend window is created or destroyed. When it's destroyed,
windowNumber will be 0.
*/
- (void) setWindowNumber: (int)windowNumber;
- (void) setWindowNumber: (NSInteger)windowNumber;
// Flags controlling if elements are present
- (void) setHasMenu: (BOOL) flag;

View file

@ -234,8 +234,8 @@ APPKIT_EXPORT NSWindow* GSWindowWithNumber(NSInteger num);
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
// Window operations
APPKIT_EXPORT void NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum);
APPKIT_EXPORT void NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum);
APPKIT_EXPORT void NSConvertGlobalToWindowNumber(int globalNum, NSInteger *winNum);
APPKIT_EXPORT void NSConvertWindowNumberToGlobal(NSInteger winNum, unsigned int *globalNum);
// Rectangle drawing
APPKIT_EXPORT NSRect NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect,

View file

@ -1174,7 +1174,7 @@ void NSSetFocusRingStyle(NSFocusRingPlacement placement)
}
void
NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum)
NSConvertGlobalToWindowNumber(int globalNum, NSInteger *winNum)
{
NSArray *windows = GSAllWindows();
NSUInteger count = [windows count];
@ -1194,7 +1194,7 @@ NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum)
}
void
NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum)
NSConvertWindowNumberToGlobal(NSInteger winNum, unsigned int *globalNum)
{
*globalNum = (int)(intptr_t)[GSWindowWithNumber(winNum) windowRef];
}

View file

@ -72,7 +72,7 @@ static NSString *NSCurrentServerThreadKey;
GSDisplayServer *
GSServerForWindow(NSWindow *window)
{
int num;
NSInteger num;
if (windowmaps == NULL)
{

View file

@ -347,7 +347,7 @@ static GSDragView *sharedDragView = nil;
action: (NSDragOperation)action
position: (NSPoint)eventLocation
timestamp: (NSTimeInterval)time
toWindow: (int)dWindowNumber
toWindow: (NSInteger)dWindowNumber
{
}

View file

@ -31,8 +31,8 @@
#import "GSIconManager.h"
@protocol GSIconManager
- (NSRect) setWindow: (unsigned int)aWindowNumber appProcessId: (int)aProcessId;
- (void) removeWindow: (unsigned int)aWindowNumber;
- (NSRect) setWindow: (NSInteger)aWindowNumber appProcessId: (int)aProcessId;
- (void) removeWindow: (NSInteger)aWindowNumber;
- (NSSize) getSizeWindow;
- (id) retain;
- (void) release;

View file

@ -77,7 +77,7 @@
float imgDist = sqrt((imgSize.width * imgSize.width) +
(imgSize.height * imgSize.height));
int steps = (int)(dist/imgDist);
int windowNumber = [_window windowNumber];
NSInteger windowNumber = [_window windowNumber];
GSDisplayServer *server = GSServerForWindow(_window);

View file

@ -426,7 +426,7 @@ static inline NSRect RectWithSizeScaledByFactor(NSRect aRect, CGFloat factor)
[GSServerForWindow(window) titlewindow: title : windowNumber];
}
- (void) setWindowNumber: (int)theWindowNumber
- (void) setWindowNumber: (NSInteger)theWindowNumber
{
windowNumber = theWindowNumber;
if (!windowNumber)