summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java54
1 files changed, 27 insertions, 27 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
index 27fd287fb4..14e1ac5626 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
@@ -103,7 +103,7 @@ public class Decorations extends Canvas {
Control savedFocus;
Button defaultButton, saveDefault;
int swFlags, nAccel;
- int /*long*/ hAccel;
+ long /*int*/ hAccel;
boolean moved, resized, opened;
int oldX = OS.CW_USEDEFAULT, oldY = OS.CW_USEDEFAULT;
int oldWidth = OS.CW_USEDEFAULT, oldHeight = OS.CW_USEDEFAULT;
@@ -171,7 +171,7 @@ void _setMaximized (boolean maximized) {
if (OS.IsPPC) {
/* Leave space for the menu bar */
if (menuBar != null) {
- int /*long*/ hwndCB = menuBar.hwndCB;
+ long /*int*/ hwndCB = menuBar.hwndCB;
RECT rectCB = new RECT ();
OS.GetWindowRect (hwndCB, rectCB);
height -= rectCB.bottom - rectCB.top;
@@ -299,7 +299,7 @@ protected void checkSubclass () {
if (!isValidSubclass ()) error (SWT.ERROR_INVALID_SUBCLASS);
}
-int /*long*/ callWindowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ callWindowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
if (handle == 0) return 0;
return OS.DefMDIChildProc (hwnd, msg, wParam, lParam);
}
@@ -448,7 +448,7 @@ public void dispose () {
super.dispose ();
}
-Menu findMenu (int /*long*/ hMenu) {
+Menu findMenu (long /*int*/ hMenu) {
if (menus == null) return null;
for (int i=0; i<menus.length; i++) {
Menu menu = menus [i];
@@ -509,7 +509,7 @@ public Rectangle getClientArea () {
if (OS.IsHPC) {
Rectangle rect = super.getClientArea ();
if (menuBar != null) {
- int /*long*/ hwndCB = menuBar.hwndCB;
+ long /*int*/ hwndCB = menuBar.hwndCB;
int height = OS.CommandBar_Height (hwndCB);
rect.y += height;
rect.height = Math.max (0, rect.height - height);
@@ -984,7 +984,7 @@ void setImages (Image image, Image [] images) {
if (smallImage != null) smallImage.dispose ();
if (largeImage != null) largeImage.dispose ();
smallImage = largeImage = null;
- int /*long*/ hSmallIcon = 0, hLargeIcon = 0;
+ long /*int*/ hSmallIcon = 0, hLargeIcon = 0;
Image smallIcon = null, largeIcon = null;
if (image != null) {
smallIcon = largeIcon = image;
@@ -1171,7 +1171,7 @@ public void setMenuBar (Menu menu) {
} else {
if (menu != null) display.removeBar (menu);
menuBar = menu;
- int /*long*/ hMenu = menuBar != null ? menuBar.handle: 0;
+ long /*int*/ hMenu = menuBar != null ? menuBar.handle: 0;
OS.SetMenu (handle, hMenu);
}
destroyAccelerators ();
@@ -1227,7 +1227,7 @@ void setParent () {
* undocumented and possibly dangerous Windows
* feature.
*/
- int /*long*/ hwndParent = parent.handle;
+ long /*int*/ hwndParent = parent.handle;
display.lockActiveWindow = true;
OS.SetParent (handle, hwndParent);
if (!OS.IsWindowVisible (hwndParent)) {
@@ -1299,7 +1299,7 @@ void setSavedFocus (Control control) {
void setSystemMenu () {
if (OS.IsWinCE) return;
- int /*long*/ hMenu = OS.GetSystemMenu (handle, false);
+ long /*int*/ hMenu = OS.GetSystemMenu (handle, false);
if (hMenu == 0) return;
int oldCount = OS.GetMenuItemCount (hMenu);
if ((style & SWT.RESIZE) == 0) {
@@ -1358,9 +1358,9 @@ public void setText (String string) {
TCHAR buffer = new TCHAR (0, string, true);
/* Ensure that the title appears in the task bar.*/
if ((state & FOREIGN_HANDLE) != 0) {
- int /*long*/ hHeap = OS.GetProcessHeap ();
+ long /*int*/ hHeap = OS.GetProcessHeap ();
int byteCount = buffer.length () * TCHAR.sizeof;
- int /*long*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
+ long /*int*/ pszText = OS.HeapAlloc (hHeap, OS.HEAP_ZERO_MEMORY, byteCount);
OS.MoveMemory (pszText, buffer, byteCount);
OS.DefWindowProc (handle, OS.WM_SETTEXT, 0, pszText);
if (pszText != 0) OS.HeapFree (hHeap, 0, pszText);
@@ -1386,7 +1386,7 @@ public void setVisible (boolean visible) {
if (isDisposed ()) return;
if (OS.IsHPC) {
if (menuBar != null) {
- int /*long*/ hwndCB = menuBar.hwndCB;
+ long /*int*/ hwndCB = menuBar.hwndCB;
OS.CommandBar_DrawMenuBar (hwndCB, 0);
}
}
@@ -1492,7 +1492,7 @@ boolean translateMenuAccelerator (MSG msg) {
boolean translateMDIAccelerator (MSG msg) {
if (!(this instanceof Shell)) {
Shell shell = getShell ();
- int /*long*/ hwndMDIClient = shell.hwndMDIClient;
+ long /*int*/ hwndMDIClient = shell.hwndMDIClient;
if (hwndMDIClient != 0 && OS.TranslateMDISysAccel (hwndMDIClient, msg)) {
return true;
}
@@ -1570,7 +1570,7 @@ int widgetExtStyle () {
return bits;
}
-int /*long*/ widgetParent () {
+long /*int*/ widgetParent () {
Shell shell = getShell ();
return shell.hwndMDIClient ();
}
@@ -1617,7 +1617,7 @@ int widgetStyle () {
return bits;
}
-int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*long*/ lParam) {
+long /*int*/ windowProc (long /*int*/ hwnd, int msg, long /*int*/ wParam, long /*int*/ lParam) {
switch (msg) {
case Display.SWT_GETACCEL:
case Display.SWT_GETACCELCOUNT:
@@ -1627,7 +1627,7 @@ int /*long*/ windowProc (int /*long*/ hwnd, int msg, int /*long*/ wParam, int /*
return super.windowProc (hwnd, msg, wParam, lParam);
}
-LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_ACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_ACTIVATE (wParam, lParam);
if (result != null) return result;
/*
@@ -1688,14 +1688,14 @@ LRESULT WM_ACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_CLOSE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_CLOSE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_CLOSE (wParam, lParam);
if (result != null) return result;
if (isEnabled () && isActive ()) closeWidget ();
return LRESULT.ZERO;
}
-LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_HOTKEY (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_HOTKEY (wParam, lParam);
if (result != null) return result;
if (OS.IsSP) {
@@ -1721,13 +1721,13 @@ LRESULT WM_HOTKEY (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_KILLFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_KILLFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_KILLFOCUS (wParam, lParam);
saveFocus ();
return result;
}
-LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_MOVE (long /*int*/ wParam, long /*int*/ lParam) {
if (moved) {
Point location = getLocation ();
if (location.x == oldX && location.y == oldY) {
@@ -1739,7 +1739,7 @@ LRESULT WM_MOVE (int /*long*/ wParam, int /*long*/ lParam) {
return super.WM_MOVE (wParam, lParam);
}
-LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_NCACTIVATE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_NCACTIVATE (wParam, lParam);
if (result != null) return result;
if (wParam == 0) {
@@ -1759,13 +1759,13 @@ LRESULT WM_NCACTIVATE (int /*long*/ wParam, int /*long*/ lParam) {
}
}
if (!(this instanceof Shell)) {
- int /*long*/ hwndShell = getShell().handle;
+ long /*int*/ hwndShell = getShell().handle;
OS.SendMessage (hwndShell, OS.WM_NCACTIVATE, wParam, lParam);
}
return result;
}
-LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_QUERYOPEN (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_QUERYOPEN (wParam, lParam);
if (result != null) return result;
sendEvent (SWT.Deiconify);
@@ -1773,14 +1773,14 @@ LRESULT WM_QUERYOPEN (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SETFOCUS (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SETFOCUS (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SETFOCUS (wParam, lParam);
if (isDisposed ()) return result;
if (savedFocus != this) restoreFocus ();
return result;
}
-LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SIZE (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = null;
boolean changed = true;
if (resized) {
@@ -1815,7 +1815,7 @@ LRESULT WM_SIZE (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_SYSCOMMAND (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_SYSCOMMAND (wParam, lParam);
if (result != null) return result;
if (!(this instanceof Shell)) {
@@ -1834,7 +1834,7 @@ LRESULT WM_SYSCOMMAND (int /*long*/ wParam, int /*long*/ lParam) {
return result;
}
-LRESULT WM_WINDOWPOSCHANGING (int /*long*/ wParam, int /*long*/ lParam) {
+LRESULT WM_WINDOWPOSCHANGING (long /*int*/ wParam, long /*int*/ lParam) {
LRESULT result = super.WM_WINDOWPOSCHANGING (wParam, lParam);
if (result != null) return result;
if (display.lockActiveWindow) {
generated by cgit (git 2.34.1) at 2024-06-09 21:42:49 +0000