diff options
| author | Veronika Irvine <torres> | 2001-06-13 14:51:38 +0000 |
|---|---|---|
| committer | Veronika Irvine <torres> | 2001-06-13 14:51:38 +0000 |
| commit | 50a4a4f364cb83db4cbfcbc995e3e69822b20a67 (patch) | |
| tree | 19ba5c5ff2528f45503774032e812a06ae93bcd4 | |
| parent | ee1f1db44911afbd040ea9bfd56b8dbb0be456c9 (diff) | |
| download | eclipse.platform.swt-50a4a4f364cb83db4cbfcbc995e3e69822b20a67.tar.gz eclipse.platform.swt-50a4a4f364cb83db4cbfcbc995e3e69822b20a67.tar.xz eclipse.platform.swt-50a4a4f364cb83db4cbfcbc995e3e69822b20a67.zip | |
*** empty log message ***
| -rwxr-xr-x | bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java | 15 |
1 files changed, 13 insertions, 2 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 e83ec1ce09..5598fb38c4 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 @@ -733,8 +733,19 @@ private int GetWindowContext(int ppFrame, int ppDoc, int lprcPosRect, int lprcCl frameInfo.cb = OLEINPLACEFRAMEINFO.sizeof;
frameInfo.fMDIApp = 0;
frameInfo.hwndFrame = frame.handle;
- //frameInfo.cAccelEntries = ??;
- //frameInfo.hAccel = ??;
+ Menu menubar = frame.getMenubar();
+ if (menubar != null && !menubar.isDisposed()) {
+ Shell shell = menubar.getShell();
+ int hwnd = shell.handle;
+ int cAccel = OS.SendMessage (hwnd, OS.WM_APP, 0, 0);
+ if (cAccel != 0) {
+ int hAccel = OS.SendMessage (hwnd, OS.WM_APP+1, 0, 0);
+ if (hAccel != 0) {
+ frameInfo.cAccelEntries = cAccel;
+ frameInfo.haccel = hAccel;
+ }
+ }
+ }
COM.MoveMemory(lpFrameInfo, frameInfo, OLEINPLACEFRAMEINFO.sizeof);
return COM.S_OK;
|