From 1dcfea3f4226e31b6ed0c184cec475211d1ebfe4 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 11 Aug 2016 02:20:47 +0200
Subject: [PATCH] Remove dead code UIUtil.isUnderAquaLookAndFeel() is always
 false

---
 .../src/com/intellij/openapi/ui/ComboBox.java | 28 +------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
index b320b9f85a7b..59eeaae20025 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBox.java
@@ -17,7 +17,6 @@ package com.intellij.openapi.ui;
 
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
-import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.components.JBList;
@@ -27,7 +26,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import javax.swing.plaf.UIResource;
 import javax.swing.plaf.basic.ComboPopup;
 import javax.swing.table.TableCellEditor;
 import java.awt.*;
@@ -242,14 +240,7 @@ public class ComboBox<E> extends ComboBoxWithWidePopup<E> implements AWTEventLis
   }
 
   public final void setEditor(final ComboBoxEditor editor) {
-    ComboBoxEditor _editor = editor;
-    if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel()) {
-      if (editor instanceof UIResource) {
-        _editor = new FixedComboBoxEditor();
-      }
-    }
-
-    super.setEditor(new MyEditor(this, _editor));
+    super.setEditor(new MyEditor(this, editor));
   }
 
   public final Dimension getMinimumSize() {
@@ -266,23 +257,6 @@ public class ComboBox<E> extends ComboBoxWithWidePopup<E> implements AWTEventLis
     return new Dimension(width, UIUtil.fixComboBoxHeight(preferredSize.height));
   }
 
-  @Override
-  public Insets getInsets() {
-    Insets insets = super.getInsets();
-    if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel() && isEditable) {
-      insets.right += 2;
-    }
-    return insets;
-  }
-
-  @Override
-  public boolean hasFocus() {
-    if (SystemInfo.isMac && UIUtil.isUnderAquaLookAndFeel() && myPaintingNow && isEditable) {
-      return false;
-    }
-    return super.hasFocus();
-  }
-
   protected Dimension getOriginalPreferredSize() {
     return super.getPreferredSize();
   }