Author: mlytwyn
Date: Fri Nov 25 18:02:46 2016
New Revision: 40236
URL: http://svn.gna.org/viewcvs/gnustep?rev=40236&view=rev
Log:
More 64 bit updates for use of MSWindows HANDLE/WHnd representation
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSDragView.h
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSGraphics.h
libs/gui/branches/gnustep_testplant_branch/Source/Functions.m
libs/gui/branches/gnustep_testplant_branch/Source/GSDisplayServer.m
libs/gui/branches/gnustep_testplant_branch/Source/GSDragView.m
libs/gui/branches/gnustep_testplant_branch/Source/GSIconManager.m
libs/gui/branches/gnustep_testplant_branch/Source/GSSlideView.m
libs/gui/branches/gnustep_testplant_branch/Source/GSWindowDecorationView.m
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSDragView.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSDragView.h?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSDragView.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSDragView.h
Fri Nov 25 18:02:46 2016
@@ -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;
Modified:
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
---
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
(original)
+++
libs/gui/branches/gnustep_testplant_branch/Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
Fri Nov 25 18:02:46 2016
@@ -53,7 +53,7 @@
@interface GSWindowDecorationView : NSView
{
NSWindow *window; /* not retained */
- int windowNumber;
+ NSInteger windowNumber;
NSRect contentRect;
int inputState;
BOOL documentEdited;
@@ -82,7 +82,7 @@
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;
Modified: libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSGraphics.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSGraphics.h?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSGraphics.h
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Headers/AppKit/NSGraphics.h
Fri Nov 25 18:02:46 2016
@@ -234,8 +234,8 @@
#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,
Modified: libs/gui/branches/gnustep_testplant_branch/Source/Functions.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/Functions.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/Functions.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/Functions.m Fri Nov
25 18:02:46 2016
@@ -1174,7 +1174,7 @@
}
void
-NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum)
+NSConvertGlobalToWindowNumber(int globalNum, NSInteger *winNum)
{
NSArray *windows = GSAllWindows();
NSUInteger count = [windows count];
@@ -1194,7 +1194,7 @@
}
void
-NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum)
+NSConvertWindowNumberToGlobal(NSInteger winNum, unsigned int *globalNum)
{
*globalNum = (int)(intptr_t)[GSWindowWithNumber(winNum) windowRef];
}
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSDisplayServer.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSDisplayServer.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSDisplayServer.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSDisplayServer.m Fri Nov
25 18:02:46 2016
@@ -72,7 +72,7 @@
GSDisplayServer *
GSServerForWindow(NSWindow *window)
{
- int num;
+ NSInteger num;
if (windowmaps == NULL)
{
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSDragView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSDragView.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSDragView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSDragView.m Fri Nov
25 18:02:46 2016
@@ -347,7 +347,7 @@
action: (NSDragOperation)action
position: (NSPoint)eventLocation
timestamp: (NSTimeInterval)time
- toWindow: (int)dWindowNumber
+ toWindow: (NSInteger)dWindowNumber
{
}
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSIconManager.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSIconManager.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSIconManager.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSIconManager.m Fri Nov
25 18:02:46 2016
@@ -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;
Modified: libs/gui/branches/gnustep_testplant_branch/Source/GSSlideView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSSlideView.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSSlideView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSSlideView.m Fri Nov
25 18:02:46 2016
@@ -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);
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/GSWindowDecorationView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/GSWindowDecorationView.m?rev=40236&r1=40235&r2=40236&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/GSWindowDecorationView.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/GSWindowDecorationView.m
Fri Nov 25 18:02:46 2016
@@ -426,7 +426,7 @@
[GSServerForWindow(window) titlewindow: title : windowNumber];
}
-- (void) setWindowNumber: (int)theWindowNumber
+- (void) setWindowNumber: (NSInteger)theWindowNumber
{
windowNumber = theWindowNumber;
if (!windowNumber)
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
