From 2bc81a3c5ad529c53dd26a402c0fde0253c615a0 Mon Sep 17 00:00:00 2001
From: plough <plough@fanruan.com>
Date: Wed, 3 Jan 2018 10:18:57 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-6258=20tab=E6=A0=87=E7=AD=BE=E5=8F=B3?=
 =?UTF-8?q?=E5=87=BB=E6=97=B6=E5=8E=9F=E6=9C=AC=E7=9A=84=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=A2=AB=E8=A6=86=E7=9B=96=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/designer/creator/cardlayout/XCardAddButton.java | 7 ++++++-
 .../designer/creator/cardlayout/XCardSwitchButton.java     | 5 +++++
 .../designer/creator/cardlayout/XWCardTagLayout.java       | 6 ++++++
 .../design/designer/creator/cardlayout/XWTabFitLayout.java | 6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
index 5ab71c3d2e..0f9c744623 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardAddButton.java
@@ -6,7 +6,7 @@ import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.event.MouseEvent;
 
-import javax.swing.Icon;
+import javax.swing.*;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.background.ColorBackground;
@@ -110,6 +110,11 @@ public class XCardAddButton extends XButton{
 		tagLayout.setTabsAndAdjust();
 		LayoutUtils.layoutRootContainer(designer.getRootComponent());
     }
+
+	@Override
+	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return null;  // 不要菜单
+	}
     
     private void initRelateLayout(){
     	XWCardTitleLayout titleLayout = (XWCardTitleLayout)this.getBackupParent();
diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
index 784fd61fe8..daa8d339f1 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java
@@ -224,6 +224,11 @@ public class XCardSwitchButton extends XButton {
 		GUICoreUtils.showPopupMenu(jPopupMenu, editingMouseListener.getDesigner(), e.getX(), e.getY());
 	}
 
+	@Override
+	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return null;  // 自己有一个showPopupMenu，不需要使用通用的弹出菜单
+	}
+
 	//删除card，同时修改其他switchbutton和tabfit的index
 	private void deleteCard(XCardSwitchButton button,int index){
 		String titleName = button.getContentLabel().getText();
diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
index 5c3d80de6e..9490f73c42 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java
@@ -12,6 +12,7 @@ import java.awt.event.MouseEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.*;
 import javax.swing.border.Border;
 
 import com.fr.base.GraphHelper;
@@ -242,6 +243,11 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         }
     }
 
+    @Override
+    public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
+        return null;  // 不要菜单
+    }
+
     @Override
     public int[] getDirections() {
         return ((XCreator)getParent()).getDirections();
diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
index 90e85b2533..8555d03f6e 100644
--- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
+++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
@@ -26,6 +26,7 @@ import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
+import javax.swing.*;
 import javax.swing.border.Border;
 import java.awt.Color;
 import java.awt.Component;
@@ -103,6 +104,11 @@ public class XWTabFitLayout extends XWFitLayout {
 		super(widget, initSize);
 	}
 
+	@Override
+	public JPopupMenu createPopupMenu(FormDesigner formDesigner) {
+		return null;  // 不要菜单
+	}
+
 	/**
 	 *  得到属性名
 	 * @return 属性名