From: <ez...@us...> - 2013-09-23 21:41:59
|
Revision: 23204 http://jedit.svn.sourceforge.net/jedit/?rev=23204&view=rev Author: ezust Date: 2013-09-23 21:41:51 +0000 (Mon, 23 Sep 2013) Log Message: ----------- Removed some old MacOSX workaround code (#3615043 Makarius) Modified Paths: -------------- jEdit/trunk/doc/CHANGES.txt jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventWorkaround.java Modified: jEdit/trunk/doc/CHANGES.txt =================================================================== --- jEdit/trunk/doc/CHANGES.txt 2013-09-22 23:36:01 UTC (rev 23203) +++ jEdit/trunk/doc/CHANGES.txt 2013-09-23 21:41:51 UTC (rev 23204) @@ -53,6 +53,8 @@ - New macros: Go To Offset, Reverse Selection (#3614563, #3614564 Thomas Meyer) +- Removed some old MacOSX workaround code (#3615043 Makarius) + }}} }}} Modified: jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2013-09-22 23:36:01 UTC (rev 23203) +++ jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventTranslator.java 2013-09-23 21:41:51 UTC (rev 23204) @@ -114,9 +114,6 @@ case KeyEvent.KEY_TYPED: char ch = evt.getKeyChar(); - if(KeyEventWorkaround.isMacControl(evt)) - ch |= 0x60; - switch(ch) { case '\n': Modified: jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventWorkaround.java =================================================================== --- jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventWorkaround.java 2013-09-22 23:36:01 UTC (rev 23203) +++ jEdit/trunk/org/gjt/sp/jedit/gui/KeyEventWorkaround.java 2013-09-23 21:41:51 UTC (rev 23204) @@ -188,17 +188,6 @@ } } //}}} - //{{{ isMacControl() method - /** - * Apple sucks. - */ - public static boolean isMacControl(KeyEvent evt) - { - return (OperatingSystem.isMacOS() && - (evt.getModifiers() & InputEvent.CTRL_MASK) != 0 - && evt.getKeyChar() <= 0x2B); - } //}}} - //{{{ isNumericKeypad() method public static boolean isNumericKeypad(int keyCode) { @@ -282,8 +271,7 @@ case KeyEvent.KEY_TYPED: // need to let \b through so that backspace will work // in HistoryTextFields - if(!isMacControl(evt) - && (ch < 0x20 || ch == 0x7f || ch == 0xff) + if((ch < 0x20 || ch == 0x7f || ch == 0xff) && ch != '\b' && ch != '\t' && ch != '\n') { return null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |