wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 432466, fixing bustage

Browse Source
This commit is contained in:
roc+@cs.cmu.edu 2008-05-06 22:17:40 -07:00
parent f4e6581a24
commit aee401973e
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widget/src/cocoa/nsChildView.h
View File

@ -385,11 +385,11 @@ protected:
virtual NSView* CreateCocoaView(NSRect inFrame); virtual NSView* CreateCocoaView(NSRect inFrame);
void TearDownView(); void TearDownView();
virtual void SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout, virtual nsresult SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
PRInt32 aNativeKeyCode, PRInt32 aNativeKeyCode,
PRUint32 aModifierFlags, PRUint32 aModifierFlags,
const nsAString& aCharacters, const nsAString& aCharacters,
const nsAString& aUnmodifiedCharacters); const nsAString& aUnmodifiedCharacters);
protected: protected:

16
widget/src/cocoa/nsChildView.mm
View File

@ -1270,13 +1270,13 @@ static const PRUint32 sModifierFlagMap[][2] = {
{ nsIWidget::HELP, NSHelpKeyMask }, { nsIWidget::HELP, NSHelpKeyMask },
{ nsIWidget::FUNCTION, NSFunctionKeyMask } { nsIWidget::FUNCTION, NSFunctionKeyMask }
}; };
void nsChildView::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout, nsresult nsChildView::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
PRInt32 aNativeKeyCode, PRInt32 aNativeKeyCode,
PRUint32 aModifierFlags, PRUint32 aModifierFlags,
const nsAString& aCharacters, const nsAString& aCharacters,
const nsAString& aUnmodifiedCharacters) const nsAString& aUnmodifiedCharacters)
{ {
NS_OBJC_BEGIN_TRY_ABORT_BLOCK; NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
NS_ASSERTION(aNativeKeyboardLayout, "Layout cannot be 0"); NS_ASSERTION(aNativeKeyboardLayout, "Layout cannot be 0");
@ -1312,7 +1312,9 @@ void nsChildView::SynthesizeNativeKeyEvent(PRInt32 aNativeKeyboardLayout,
gOverrideKeyboardLayout = currentLayout; gOverrideKeyboardLayout = currentLayout;
} }
NS_OBJC_END_TRY_ABORT_BLOCK; return NS_OK;
NS_OBJC_END_TRY_ABORT_BLOCK_NSRESULT;
} }
#pragma mark - #pragma mark -