corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 694226, merge nsWidgetAtoms and nsGkAtoms, r=roc

Browse Source
This commit is contained in:
Neil Deakin
2011-10-14 14:11:22 -04:00
parent ebba5fe04f
commit a80c765197
30 changed files with 258 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
widget/src/qt/nsWindow.cpp
View File

@@ -1517,7 +1517,7 @@ is_latin_shortcut_key(quint32 aKeyval)
nsEventStatus
nsWindow::DispatchCommandEvent(nsIAtom* aCommand)
{
nsCommandEvent event(PR_TRUE, nsWidgetAtoms::onAppCommand, aCommand, this);
nsCommandEvent event(PR_TRUE, nsGkAtoms::onAppCommand, aCommand, this);
nsEventStatus status;
DispatchEvent(&event, status);
@@ -1673,19 +1673,19 @@ nsWindow::OnKeyPressEvent(QKeyEvent *aEvent)
// Look for specialized app-command keys
switch (aEvent->key()) {
case Qt::Key_Back:
return DispatchCommandEvent(nsWidgetAtoms::Back);
return DispatchCommandEvent(nsGkAtoms::Back);
case Qt::Key_Forward:
return DispatchCommandEvent(nsWidgetAtoms::Forward);
return DispatchCommandEvent(nsGkAtoms::Forward);
case Qt::Key_Refresh:
return DispatchCommandEvent(nsWidgetAtoms::Reload);
return DispatchCommandEvent(nsGkAtoms::Reload);
case Qt::Key_Stop:
return DispatchCommandEvent(nsWidgetAtoms::Stop);
return DispatchCommandEvent(nsGkAtoms::Stop);
case Qt::Key_Search:
return DispatchCommandEvent(nsWidgetAtoms::Search);
return DispatchCommandEvent(nsGkAtoms::Search);
case Qt::Key_Favorites:
return DispatchCommandEvent(nsWidgetAtoms::Bookmarks);
return DispatchCommandEvent(nsGkAtoms::Bookmarks);
case Qt::Key_HomePage:
return DispatchCommandEvent(nsWidgetAtoms::Home);
return DispatchCommandEvent(nsGkAtoms::Home);
case Qt::Key_Copy:
case Qt::Key_F16: // F16, F20, F18, F14 are old keysyms for Copy Cut Paste Undo
return DispatchContentCommandEvent(NS_CONTENT_COMMAND_COPY);