Index: kmdi/kmdimainfrm.cpp =================================================================== --- kmdi/kmdimainfrm.cpp (revision 485120) +++ kmdi/kmdimainfrm.cpp (working copy) @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -216,12 +217,7 @@ m_pPlacingMenu = new QPopupMenu( this, "placing_menu" ); - d->closeWindowAction = new KAction(i18n("&Close"), -#ifdef Q_WS_WIN - CTRL|Key_F4, -#else - 0, -#endif + d->closeWindowAction = new KAction(i18n("&Close"), KStdAccel::close(), this, SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar Index: kdecore/kstdaccel.cpp =================================================================== --- kdecore/kstdaccel.cpp (revision 485122) +++ kdecore/kstdaccel.cpp (working copy) @@ -52,7 +52,12 @@ {AccelNone, "Group:File", I18N_NOOP("File"), 0, 0, 0, 0, KShortcut(), false }, { Open, I18N_NOOP("Open"), 0, Qt::CTRL+Qt::Key_O, 0, 0, 0, KShortcut(), false }, { New, I18N_NOOP("New"), 0, Qt::CTRL+Qt::Key_N, 0, 0, 0, KShortcut(), false }, - { Close, I18N_NOOP("Close"), 0, Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false }, + { Close, I18N_NOOP("Close"), 0, +#ifdef Q_WS_WIN + Qt::CTRL+Qt::Key_F4, 0, Qt::CTRL+Qt::Key_W, 0, KShortcut(), false }, +#else + Qt::CTRL+Qt::Key_W, Qt::CTRL+Qt::Key_Escape, 0, Qt::CTRL+Qt::Key_W, KShortcut(), false }, +#endif { Save, I18N_NOOP("Save"), 0, Qt::CTRL+Qt::Key_S, 0, 0, 0, KShortcut(), false }, { Print, I18N_NOOP("Print"), 0, Qt::CTRL+Qt::Key_P, 0, 0, 0, KShortcut(), false }, { Quit, I18N_NOOP("Quit"), 0, Qt::CTRL+Qt::Key_Q, 0, 0, 0, KShortcut(), false },