gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/branches/gnustep_testplant_branch@40237 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2016-11-25 17:02:59 +00:00
parent 76395e0c2e
commit 25949d2ae1
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/x11/XGServerWindow.h
View file

@ -129,7 +129,7 @@ typedef struct _gswindow_device_t {
@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;

14
Source/win32/WIN32Server.m
View file

@ -1388,7 +1388,7 @@ LRESULT CALLBACK windowEnumCallback(HWND hwnd, LPARAM lParam)
// 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 @@ LRESULT CALLBACK windowEnumCallback(HWND hwnd, LPARAM lParam)
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 @@ LRESULT CALLBACK windowEnumCallback(HWND hwnd, LPARAM lParam)
SetLayeredWindowAttributes(hwnd, 0, 255, LWA_ALPHA);
[self _setWindowOwnedByServer: (int)hwnd];
[self _setWindowOwnedByServer: (NSInteger)hwnd];
}
return (int)hwnd;
return (NSInteger)hwnd;
}
- (void) termwindow: (NSInteger) winNum
@ -3369,7 +3369,7 @@ process_key_event(WIN32Server *svr, HWND hwnd, WPARAM wParam, LPARAM lParam, NSE
// 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 @@ process_mouse_event(WIN32Server *svr, HWND hwnd, WPARAM wParam, LPARAM lParam,
location: eventLocation
modifierFlags: eventFlags
timestamp: time
windowNumber: (int)hwnd
windowNumber: (NSInteger)hwnd
context: gcontext
eventNumber: tick
clickCount: clickCount

2
Source/win32/w32_activate.m
View file

@ -61,7 +61,7 @@
location: NSMakePoint(0, 0)
modifierFlags: 0
timestamp: 0
windowNumber: (int)hwnd
windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowLeave
data1: 0

4
Source/win32/w32_create.m
View file

@ -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...

2
Source/win32/w32_general.m
View file

@ -52,7 +52,7 @@
location: eventLocation
modifierFlags: 0
timestamp: 0
windowNumber: (int)hwnd
windowNumber: (NSInteger)hwnd
context: GSCurrentContext()
subtype: GSAppKitWindowClose
data1: 0

4
Source/win32/w32_movesize.m
View file

@ -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

4
Source/win32/w32_text_focus.m
View file

@ -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

6
Source/x11/XGServerWindow.m
View file

@ -84,7 +84,7 @@ static char *rootName = 0;
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 @@ static void setWindowHintsForStyle (Display *dpy, Window window,
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 @@ NSLog(@"styleoffsets ... guessing offsets\n");
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)