From e45d55225d5334799f1a10f6f61b12d0e4d3c6ed Mon Sep 17 00:00:00 2001 From: "Jerry.Kirk%Nexwarecorp.com" Date: Tue, 6 Jul 1999 14:59:34 +0000 Subject: [PATCH] - menuitem tweak for photon --- widget/src/photon/nsMenuItem.cpp | 10 ++++++---- widget/src/photon/nsMenuItem.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/widget/src/photon/nsMenuItem.cpp b/widget/src/photon/nsMenuItem.cpp index 6c472903e6ae..72a81cea3e5c 100644 --- a/widget/src/photon/nsMenuItem.cpp +++ b/widget/src/photon/nsMenuItem.cpp @@ -568,7 +568,8 @@ NS_METHOD nsMenuItem::SetWebShell(nsIWebShell * aWebShell) NS_IMETHODIMP nsMenuItem::SetShortcutChar(const nsString &aText) { PR_LOG(PhWidLog, PR_LOG_ERROR,("nsMenuItem::SetShortcut - Not Implemented\n")); -// mKeyEquivalent = aText; + + mKeyEquivalent = aText; return NS_OK; } @@ -576,7 +577,8 @@ NS_IMETHODIMP nsMenuItem::SetShortcutChar(const nsString &aText) NS_IMETHODIMP nsMenuItem::GetShortcutChar(nsString &aText) { PR_LOG(PhWidLog, PR_LOG_ERROR,("nsMenuItem::GetShortcut - Not Implemented\n")); -// aText = mKeyEquivalent; + + aText = mKeyEquivalent; return NS_OK; } @@ -585,7 +587,7 @@ NS_IMETHODIMP nsMenuItem::SetModifiers(PRUint8 aModifiers) { PR_LOG(PhWidLog, PR_LOG_ERROR,("nsMenuItem::SetModifiers - Not Implemented\n")); -// mModifiers = aModifiers; + mModifiers = aModifiers; return NS_OK; } @@ -594,7 +596,7 @@ NS_IMETHODIMP nsMenuItem::GetModifiers(PRUint8 * aModifiers) { PR_LOG(PhWidLog, PR_LOG_ERROR,("nsMenuItem::GetModifiers - Not Implemented\n")); -// *aModifiers = mModifiers; + *aModifiers = mModifiers; return NS_OK; } diff --git a/widget/src/photon/nsMenuItem.h b/widget/src/photon/nsMenuItem.h index a54265ebe843..59f66aab6805 100644 --- a/widget/src/photon/nsMenuItem.h +++ b/widget/src/photon/nsMenuItem.h @@ -97,6 +97,8 @@ protected: nsString mLabel; + nsString mKeyEquivalent; + PRUint8 mModifiers; PRUint32 mCommand; nsIMenu *mMenuParent; nsIPopUpMenu *mPopUpParent;