Author: mlytwyn
Date: Fri Nov 25 18:02:59 2016
New Revision: 40237
URL: http://svn.gna.org/viewcvs/gnustep?rev=40237&view=rev
Log:
More 64 bit updates for use of MSWindows HANDLE/WHnd representation
Modified:
libs/back/branches/gnustep_testplant_branch/Headers/x11/XGServerWindow.h
libs/back/branches/gnustep_testplant_branch/Source/win32/WIN32Server.m
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_activate.m
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_create.m
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_general.m
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_movesize.m
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_text_focus.m
libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
Modified:
libs/back/branches/gnustep_testplant_branch/Headers/x11/XGServerWindow.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Headers/x11/XGServerWindow.h?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Headers/x11/XGServerWindow.h
(original)
+++ libs/back/branches/gnustep_testplant_branch/Headers/x11/XGServerWindow.h
Fri Nov 25 18:02:59 2016
@@ -129,7 +129,7 @@
@interface XGServer (DPSWindow)
+ (gswindow_device_t *) _windowForXWindow: (Window)xWindow;
+ (gswindow_device_t *) _windowForXParent: (Window)xWindow;
-+ (gswindow_device_t *) _windowWithTag: (int)windowNumber;
++ (gswindow_device_t *) _windowWithTag: (NSInteger)windowNumber;
- (void) _addExposedRectangle: (XRectangle)rectangle : (NSInteger)win : (BOOL)
ignoreBacking;
- (void) _processExposedRectangles: (NSInteger)win;
- (void) _initializeCursorForXWindow: (Window) win;
Modified: libs/back/branches/gnustep_testplant_branch/Source/win32/WIN32Server.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/WIN32Server.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/WIN32Server.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/WIN32Server.m
Fri Nov 25 18:02:59 2016
@@ -1388,7 +1388,7 @@
// key events should go to the key window if we have one (Windows' focus
window isn't always appropriate)
int windowNumber = [[NSApp keyWindow] windowNumber];
if (windowNumber == 0)
- windowNumber = (int)hwnd;
+ windowNumber = (NSInteger)hwnd;
/* FIXME: How do you guarantee a context is associated with an event? */
BOOL repeat = (lParam & 0xFFFF) > 1;
@@ -1416,9 +1416,9 @@
GetKeyboardState(keyState);
// key events should go to the key window if we have one (Windows' focus
window isn't always appropriate)
- int windowNumber = [[NSApp keyWindow] windowNumber];
+ NSInteger windowNumber = [[NSApp keyWindow] windowNumber];
if (windowNumber == 0)
- windowNumber = (int)hwnd;
+ windowNumber = (NSInteger)hwnd;
/* FIXME: How do you guarantee a context is associated with an event? */
BOOL repeat = (lParam & 0xFFFF) > 1;
@@ -2140,9 +2140,9 @@
SetLayeredWindowAttributes(hwnd, 0, 255, LWA_ALPHA);
- [self _setWindowOwnedByServer: (int)hwnd];
- }
- return (int)hwnd;
+ [self _setWindowOwnedByServer: (NSInteger)hwnd];
+ }
+ return (NSInteger)hwnd;
}
- (void) termwindow: (NSInteger) winNum
@@ -3369,7 +3369,7 @@
// key events should go to the key window if we have one (Windows' focus
window isn't always appropriate)
int windowNumber = [[NSApp keyWindow] windowNumber];
if (windowNumber == 0)
- windowNumber = (int)hwnd;
+ windowNumber = (NSInteger)hwnd;
event = [NSEvent keyEventWithType: eventType
location: eventLocation
@@ -3602,7 +3602,7 @@
location: eventLocation
modifierFlags: eventFlags
timestamp: time
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: gcontext
eventNumber: tick
clickCount: clickCount
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_activate.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/w32_activate.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/w32_activate.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/w32_activate.m
Fri Nov 25 18:02:59 2016
@@ -61,7 +61,7 @@
location: NSMakePoint(0, 0)
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowLeave
data1: 0
Modified: libs/back/branches/gnustep_testplant_branch/Source/win32/w32_create.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/w32_create.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/w32_create.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/w32_create.m
Fri Nov 25 18:02:59 2016
@@ -68,10 +68,10 @@
win->useHDC = NO;
// Save win internals structure pointer for window handle...
- SetWindowLongPtr(hwnd, GWLP_USERDATA, (int)win);
+ SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG)win);
SetWindowLongPtr(hwnd, IME_INFO, (LONG)ime);
- [self windowbacking: type : (int)hwnd];
+ [self windowbacking: type : (NSInteger)hwnd];
// Find the icon file, assume it has the same name as the "icon" which
// was specified in the bundle's dictionary...
Modified: libs/back/branches/gnustep_testplant_branch/Source/win32/w32_general.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/w32_general.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/w32_general.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/w32_general.m
Fri Nov 25 18:02:59 2016
@@ -52,7 +52,7 @@
location: eventLocation
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowClose
data1: 0
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_movesize.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/w32_movesize.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/w32_movesize.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/w32_movesize.m
Fri Nov 25 18:02:59 2016
@@ -48,7 +48,7 @@
location: eventLocation
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowMoved
data1: rect.origin.x
@@ -105,7 +105,7 @@
location: eventLocation
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowResized
data1: rect.size.width
Modified:
libs/back/branches/gnustep_testplant_branch/Source/win32/w32_text_focus.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/win32/w32_text_focus.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/win32/w32_text_focus.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/win32/w32_text_focus.m
Fri Nov 25 18:02:59 2016
@@ -58,7 +58,7 @@
location: NSMakePoint(0, 0)
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowFocusIn
data1: 0
@@ -82,7 +82,7 @@
location: NSMakePoint(0, 0)
modifierFlags: 0
timestamp: 0
- windowNumber: (int)hwnd
+ windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowFocusOut
data1: 0
Modified:
libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m?rev=40237&r1=40236&r2=40237&view=diff
==============================================================================
--- libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
(original)
+++ libs/back/branches/gnustep_testplant_branch/Source/x11/XGServerWindow.m
Fri Nov 25 18:02:59 2016
@@ -84,7 +84,7 @@
static Atom _net_frame_extents = None;
static Atom _kde_frame_strut = None;
-#define WINDOW_WITH_TAG(windowNumber) (gswindow_device_t
*)NSMapGet(windowtags, (void *)(uintptr_t)windowNumber)
+#define WINDOW_WITH_TAG(windowNumber) (gswindow_device_t
*)NSMapGet(windowtags, (void *)(uintptr_t)windowNumber)
/* Current mouse grab window */
static gswindow_device_t *grab_window = NULL;
@@ -471,7 +471,7 @@
return NSMapGet(windowmaps, (void *)xWindow);
}
-+ (gswindow_device_t *) _windowWithTag: (int)windowNumber
++ (gswindow_device_t *) _windowWithTag: (NSInteger)windowNumber
{
return WINDOW_WITH_TAG(windowNumber);
}
@@ -2688,7 +2688,7 @@
nswin = GSWindowWithNumber(window->number);
if (nswin != nil)
{
- int iNum = [[nswin counterpart] windowNumber];
+ NSInteger iNum = [[nswin counterpart]
windowNumber];
gswindow_device_t *iconw = WINDOW_WITH_TAG(iNum);
if (iconw != 0)
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
