diff options
author | Veronika Irvine <torres> | 2001-06-13 15:21:50 +0000 |
---|---|---|
committer | Veronika Irvine <torres> | 2001-06-13 15:21:50 +0000 |
commit | f05376abc2b190aaa4875dac31c5726b9f48cbe9 (patch) | |
tree | 61fde3a0213188f9fd09afc25dc14acd5d0f8465 | |
parent | 3dd79b6f454d6aaf4e7ed0f5f1fadd5aed3c08d9 (diff) | |
download | eclipse.platform.swt-f05376abc2b190aaa4875dac31c5726b9f48cbe9.tar.gz eclipse.platform.swt-f05376abc2b190aaa4875dac31c5726b9f48cbe9.tar.xz eclipse.platform.swt-f05376abc2b190aaa4875dac31c5726b9f48cbe9.zip |
*** empty log message ***
2 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java index 5598fb38c4..2c85d77347 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java @@ -737,9 +737,9 @@ private int GetWindowContext(int ppFrame, int ppDoc, int lprcPosRect, int lprcCl if (menubar != null && !menubar.isDisposed()) {
Shell shell = menubar.getShell();
int hwnd = shell.handle;
- int cAccel = OS.SendMessage (hwnd, OS.WM_APP, 0, 0);
+ int cAccel = OS.SendMessage(hwnd, OS.WM_APP, 0, 0);
if (cAccel != 0) {
- int hAccel = OS.SendMessage (hwnd, OS.WM_APP+1, 0, 0);
+ int hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
if (hAccel != 0) {
frameInfo.cAccelEntries = cAccel;
frameInfo.haccel = hAccel;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java index c68f235de7..87d4432ebc 100755 --- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java +++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java @@ -680,17 +680,17 @@ private boolean translateOleAccelerator(MSG msg) { return objIOleInPlaceActiveObject.TranslateAccelerator(msg) != OLE.S_FALSE;
}
private int TranslateAccelerator(int lpmsg, int wID){
- if (menubar == null || menubar.isDisposed() | !menubar.isEnabled()) return COM.S_FALSE;
+ if (menubar == null || menubar.isDisposed() || !menubar.isEnabled()) return COM.S_FALSE;
if (wID < 0) return COM.S_FALSE;
Shell shell = menubar.getShell();
int hwnd = shell.handle;
- int hAccel = OS.SendMessage (hwnd, OS.WM_APP+1, 0, 0);
+ int hAccel = OS.SendMessage(hwnd, OS.WM_APP+1, 0, 0);
if (hAccel == 0) return COM.S_FALSE;
MSG msg = new MSG();
OS.MoveMemory(msg, lpmsg, MSG.sizeof);
- int result = OS.TranslateAccelerator(hwnd, hAccel, msg );
+ int result = OS.TranslateAccelerator(hwnd, hAccel, msg);
return result == 0 ? COM.S_FALSE : COM.S_OK;
}
}
|