Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-06 14:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

320746 Remove uses of GetCurrentEventKeyModifiers. Patch by Chris Lawson <bugzilla@chrislawson.net>. r=me

Browse Source
This commit is contained in:
mark%moxienet.com 2006-03-31 16:10:13 +00:00
parent 689876306f
commit ffba30d689
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
camino/src/application/MainController.mm
View File

@ -531,7 +531,7 @@ const int kReuseWindowOnAE = 2;
{
case eBookmarkOpenBehavior_Preferred:
{
BOOL cmdKeyDown = (GetCurrentKeyModifiers() & cmdKey) != 0;
BOOL cmdKeyDown = (([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask) != 0);
if (cmdKeyDown)
if ([[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.opentabfor.middleclick" withSuccess:NULL]) {
openInNewTab = YES;

8
camino/src/browser/BrowserWindowController.mm
View File

@ -1978,14 +1978,14 @@ enum BWCOpenDest {
- (IBAction)viewSource:(id)aSender
{
BOOL loadInBackground = ((GetCurrentKeyModifiers() & shiftKey) != 0);
BOOL loadInBackground = (([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) != 0);
NSString* urlStr = [[mBrowserView getBrowserView] getFocusedURLString];
[self loadSourceOfURL:urlStr inBackground:loadInBackground];
}
- (IBAction)viewPageSource:(id)aSender
{
BOOL loadInBackground = ((GetCurrentKeyModifiers() & shiftKey) != 0);
BOOL loadInBackground = (([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) != 0);
NSString* urlStr = [[mBrowserView getBrowserView] getCurrentURI];
[self loadSourceOfURL:urlStr inBackground:loadInBackground];
}
@ -2498,7 +2498,7 @@ enum BWCOpenDest {
{
unsigned int reloadFlags = NSLoadFlagsNone;
if (([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) != 0)
if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask)
reloadFlags = NSLoadFlagsBypassCacheAndProxy;
[[mBrowserView getBrowserView] reload: reloadFlags];
@ -2850,7 +2850,7 @@ enum BWCOpenDest {
- (IBAction)reloadAllTabs:(id)sender
{
unsigned int reloadFlags = NSLoadFlagsNone;
if (([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) != 0)
if ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask)
reloadFlags = NSLoadFlagsBypassCacheAndProxy;
NSEnumerator* tabsEnum = [[mTabBrowser tabViewItems] objectEnumerator];

2
camino/src/browser/GoMenu.mm
View File

@ -428,7 +428,7 @@ static const unsigned int kMaxTitleLength = 50;
BrowserWindowController* bwc = [(MainController *)[NSApp delegate] getMainWindowBrowserController];
if (bwc)
{
if (GetCurrentKeyModifiers() & cmdKey)
if ([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask)
{
BOOL backgroundLoad = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.loadInBackground" withSuccess:NULL];
if ([[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.opentabfor.middleclick" withSuccess:NULL])

2
camino/src/download/ProgressDlgController.mm
View File

@ -376,7 +376,7 @@ static id gSharedProgressController = nil;
}
int instanceToSelect = -1;
BOOL shiftKeyDown (([theEvent modifierFlags] & NSShiftKeyMask) != 0);
BOOL shiftKeyDown = (([theEvent modifierFlags] & NSShiftKeyMask) != 0);
unichar key = [[theEvent characters] characterAtIndex:0];
switch (key)

2
camino/src/history/HistoryOutlineViewDelegate.mm
View File

@ -191,7 +191,7 @@ static NSString* const kExpandedHistoryStatesDefaultsKey = @"history_expand_stat
BOOL loadInBackground = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.loadInBackground" withSuccess:NULL];
BOOL openInTabs = [[PreferenceManager sharedInstance] getBooleanPref:"browser.tabs.opentabfor.middleclick" withSuccess:NULL];
BOOL cmdKeyDown = (GetCurrentKeyModifiers() & cmdKey) != 0;
BOOL cmdKeyDown = (([[NSApp currentEvent] modifierFlags] & NSCommandKeyMask) != 0);
NSEnumerator* itemEnum = [selectedHistoryItems objectEnumerator];
id curItem;