X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTRadioButton.java;h=2d602fa3abc1218b8612061c97743176b12ef0c6;hb=9f613a0c54cb97e9305fd87ce8eb2f76ac82804e;hp=e3d98a985329a52dfbd18769212045e8561b68d8;hpb=0c28ec38449a59cf34cf5b3c13ea02add1ee57c5;p=fanfix.git

diff --git a/src/jexer/TRadioButton.java b/src/jexer/TRadioButton.java
index e3d98a9..2d602fa 100644
--- a/src/jexer/TRadioButton.java
+++ b/src/jexer/TRadioButton.java
@@ -31,6 +31,7 @@ package jexer;
 import jexer.bits.CellAttributes;
 import jexer.bits.GraphicsChars;
 import jexer.bits.MnemonicString;
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import static jexer.TKeypress.*;
@@ -81,7 +82,7 @@ public class TRadioButton extends TWidget {
         final String label, final int id) {
 
         // Set parent and window
-        super(parent, x, y, label.length() + 4, 1);
+        super(parent, x, y, StringUtils.width(label) + 4, 1);
 
         mnemonic = new MnemonicString(label);
         this.id = id;
@@ -179,8 +180,8 @@ public class TRadioButton extends TWidget {
         }
         putCharXY(2, 0, ')', radioButtonColor);
         putStringXY(4, 0, mnemonic.getRawLabel(), radioButtonColor);
-        if (mnemonic.getShortcutIdx() >= 0) {
-            putCharXY(4 + mnemonic.getShortcutIdx(), 0,
+        if (mnemonic.getScreenShortcutIdx() >= 0) {
+            putCharXY(4 + mnemonic.getScreenShortcutIdx(), 0,
                 mnemonic.getShortcut(), mnemonicColor);
         }
     }