Fix for 178029, Include Browser doesn't accept inital drop on linux.

3 files changed, 16 insertions, 35 deletions

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index fb0c0041085..ecafd09cc80 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -42,8 +42,8 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
@@ -100,8 +100,7 @@ public class CHViewPart extends ViewPart {
     // widgets
     private PageBook fPagebook;
     private Composite fViewerPage;
-    private Composite fInfoPage;
-    private Text fInfoText;
+    private Label fInfoText;
 
     // treeviewer
     private CHContentProvider fContentProvider;
@@ -141,7 +140,7 @@ public class CHViewPart extends ViewPart {
 
     public void setMessage(String msg) {
         fInfoText.setText(msg);
-        fPagebook.showPage(fInfoPage);
+        fPagebook.showPage(fInfoText);
         fShowsMessage= true;
         updateDescription();
         updateActionEnablement();
@@ -304,12 +303,7 @@ public class CHViewPart extends ViewPart {
     }
     
     private void createInfoPage() {
-        fInfoPage = new Composite(fPagebook, SWT.NULL);
-        fInfoPage.setLayoutData(new GridData(GridData.FILL_BOTH));
-        fInfoPage.setSize(100, 100);
-        fInfoPage.setLayout(new FillLayout());
-
-        fInfoText= new Text(fInfoPage, SWT.WRAP | SWT.READ_ONLY); 
+    	fInfoText = new Label(fPagebook, SWT.TOP | SWT.LEFT | SWT.WRAP);
     }
 
     private void initDragAndDrop() {
@@ -317,7 +311,7 @@ public class CHViewPart extends ViewPart {
         Transfer[] localSelectionTransfer= new Transfer[] {
         		LocalSelectionTransfer.getTransfer()
         };
-        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_COPY);
+        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK | DND.DROP_DEFAULT);
         dropTarget.setTransfer(localSelectionTransfer);
         dropTarget.addDropListener(dropListener);
     }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
index 219a2ff5518..cd111f083f2 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
@@ -48,8 +48,8 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
@@ -110,8 +110,7 @@ public class IBViewPart extends ViewPart
     // widgets
     private PageBook fPagebook;
     private Composite fViewerPage;
-    private Composite fInfoPage;
-    private Text fInfoText;
+    private Label fInfoText;
 
     // treeviewer
     private IBContentProvider fContentProvider;
@@ -146,7 +145,7 @@ public class IBViewPart extends ViewPart
 
     public void setMessage(String msg) {
         fInfoText.setText(msg);
-        fPagebook.showPage(fInfoPage);
+        fPagebook.showPage(fInfoText);
         fShowsMessage= true;
         updateActionEnablement();
         updateDescription();
@@ -344,12 +343,7 @@ public class IBViewPart extends ViewPart
     }
     
     private void createInfoPage() {
-        fInfoPage = new Composite(fPagebook, SWT.NULL);
-        fInfoPage.setLayoutData(new GridData(GridData.FILL_BOTH));
-        fInfoPage.setSize(100, 100);
-        fInfoPage.setLayout(new FillLayout());
-
-        fInfoText= new Text(fInfoPage, SWT.WRAP | SWT.READ_ONLY); 
+    	fInfoText = new Label(fPagebook, SWT.TOP | SWT.LEFT | SWT.WRAP);
     }
 
     private void initDragAndDrop() {
@@ -358,7 +352,7 @@ public class IBViewPart extends ViewPart
                 LocalSelectionTransfer.getTransfer(),
                 ResourceTransfer.getInstance(), 
                 FileTransfer.getInstance()};
-        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_COPY);
+        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK | DND.DROP_DEFAULT);
         dropTarget.setTransfer(dropTransfers);
         dropTarget.addDropListener(dropListener);
 
@@ -378,7 +372,7 @@ public class IBViewPart extends ViewPart
             protected void onWorkingSetNameChange() {
                 updateDescription();
             }
-        };
+        }; 
 
         fIncludedByAction= 
             new Action(IBMessages.IBViewPart_showIncludedBy_label, IAction.AS_RADIO_BUTTON) { 
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
index 8fad2cc6acf..5821a856ca5 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
@@ -49,13 +49,12 @@ import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.ControlListener;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
@@ -132,8 +131,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 
     // widgets
     private PageBook fPagebook;
-    private Composite fInfoPage;
-    private Text fInfoText;
+    private Label fInfoText;
 	private SashForm fSplitter;
 	private ViewForm fHierarchyViewForm;
 	private ViewForm fMemberViewForm;
@@ -187,7 +185,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 
     public void setMessage(String msg) {
         fInfoText.setText(msg);
-        fPagebook.showPage(fInfoPage);
+        fPagebook.showPage(fInfoText);
         fShowsMessage= true;
         updateDescription();
         updateActionEnablement();
@@ -512,12 +510,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
 	}
 
 	private void createInfoPage() {
-        fInfoPage = new Composite(fPagebook, SWT.NULL);
-        fInfoPage.setLayoutData(new GridData(GridData.FILL_BOTH));
-        fInfoPage.setSize(100, 100);
-        fInfoPage.setLayout(new FillLayout());
-
-        fInfoText= new Text(fInfoPage, SWT.WRAP | SWT.READ_ONLY); 
+    	fInfoText = new Label(fPagebook, SWT.TOP | SWT.LEFT | SWT.WRAP);
     }
 
     private void initDragAndDrop() {
@@ -525,7 +518,7 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
         Transfer[] localSelectionTransfer= new Transfer[] {
         		LocalSelectionTransfer.getTransfer()
         };
-        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_COPY);
+        DropTarget dropTarget = new DropTarget(fPagebook, DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_LINK | DND.DROP_DEFAULT);
         dropTarget.setTransfer(localSelectionTransfer);
         dropTarget.addDropListener(dropListener);
     }