Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 18310)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 18311)
@@ -27,5 +27,4 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.DefaultButtonModel;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.ImageIcon;
@@ -38,4 +37,5 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JToggleButton.ToggleButtonModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SingleSelectionModel;
@@ -126,5 +126,5 @@
         wfLabel.setLabelFor(cbWireframe);
 
-        cbWireframe.setModel(new DefaultButtonModel() {
+        cbWireframe.setModel(new ToggleButtonModel() {
             @Override
             public void setSelected(boolean b) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 18310)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 18311)
@@ -152,5 +152,5 @@
      * Button model for the {@code QuadStateCheckBox}.
      */
-    private final class QuadStateDecorator implements ButtonModel {
+    private final class QuadStateDecorator extends ToggleButtonModel {
         private final ButtonModel other;
         private String propertyText;