From a06510c08ba6e425ea19715a8ec5157a90ffa43e Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 27 Sep 2017 16:52:19 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-4868=20=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E8=A7=86=E8=A7=89bug=E4=BF=AE=E6=94=B9=EF=BC=88=E4=BA=8C?=
 =?UTF-8?q?=EF=BC=89=E9=83=A8=E5=88=86=3D>19=20=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/mainframe/widget/UITreeComboBox.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java
index 7979e7ae34..83877f2a9b 100644
--- a/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java
+++ b/designer_form/src/com/fr/design/mainframe/widget/UITreeComboBox.java
@@ -16,6 +16,8 @@ import com.fr.design.designer.beans.*;
 import com.fr.design.designer.beans.events.DesignerEditListener;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.mainframe.ComponentTree;
 import com.sun.java.swing.plaf.motif.*;
@@ -24,7 +26,7 @@ import com.sun.java.swing.plaf.windows.*;
 /**
  * 控件树下拉列表框
  */
-public class UITreeComboBox extends JComboBox{
+public class UITreeComboBox extends UIComboBox {
     /**
      * 显示用的树
      */
@@ -76,7 +78,7 @@ public class UITreeComboBox extends JComboBox{
         } else if(cui instanceof MotifComboBoxUI){
             cui = new MotifJTreeComboBoxUI();
         } else {
-            cui = new WindowsJTreeComboBoxUI();
+            cui = new UIJTreeComboBoxUI();
         }
         setUI(cui);
     }
@@ -107,6 +109,12 @@ public class UITreeComboBox extends JComboBox{
         }
     }
 
+    class UIJTreeComboBoxUI extends UIComboBoxUI {
+        protected ComboPopup createPopup() {
+            return new TreePopup(comboBox);
+        }
+    }
+
     class MotifJTreeComboBoxUI extends MotifComboBoxUI{
         protected ComboPopup createPopup() {
             return new TreePopup(comboBox);