Mercurial > projects > dwt2
changeset 48:ddbfe84d86df
[swt lin] versioned imports
line wrap: on
line diff
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/SWT.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/SWT.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,7 +22,6 @@ import java.lang.all; version(Tango){ - import tango.core.Exception; } else { // Phobos }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/SWTException.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/SWTException.d Fri Mar 27 12:05:20 2009 +0100 @@ -17,7 +17,6 @@ import org.eclipse.swt.SWT; version(Tango){ - import tango.core.Exception; } else { // Phobos }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/Accessible.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/Accessible.d Fri Mar 27 12:05:20 2009 +0100 @@ -25,9 +25,12 @@ //import org.eclipse.swt.events.*; import org.eclipse.swt.internal.gtk.OS; import org.eclipse.swt.widgets.Control; -import tango.core.Array; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.DisposeEvent; +version(Tango){ +import tango.core.Array; +} else { // Phobos +} /** * Instances of this class provide a bridge between application
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleObject.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/accessibility/AccessibleObject.d Fri Mar 27 12:05:20 2009 +0100 @@ -25,7 +25,10 @@ import org.eclipse.swt.accessibility.AccessibleFactory; import org.eclipse.swt.widgets.Display; import java.lang.all; +version(Tango){ import tango.text.Util; +} else { // Phobos +} class AccessibleObject { AtkObject* handle;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/AppFileLocProvider.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/AppFileLocProvider.d Fri Mar 27 12:05:20 2009 +0100 @@ -12,8 +12,11 @@ *******************************************************************************/ module org.eclipse.swt.browser.AppFileLocProvider; +version(Tango){ import tango.sys.Environment; import tango.text.Util; +} else { // Phobos +} import java.lang.all; import org.eclipse.swt.browser.Mozilla;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/Download.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/Download.d Fri Mar 27 12:05:20 2009 +0100 @@ -12,7 +12,10 @@ *******************************************************************************/ module org.eclipse.swt.browser.Download; +version(Tango){ import Util = tango.text.Util; +} else { // Phobos +} import java.lang.all; import org.eclipse.swt.SWT;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/HelperAppLauncherDialog.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/HelperAppLauncherDialog.d Fri Mar 27 12:05:20 2009 +0100 @@ -14,7 +14,10 @@ import java.lang.all; +version(Tango){ import Utf = tango.text.convert.Utf; +} else { // Phobos +} import org.eclipse.swt.SWT;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/HelperAppLauncherDialog_1_9.d Fri Mar 27 12:05:20 2009 +0100 @@ -12,7 +12,10 @@ *******************************************************************************/ module org.eclipse.swt.browser.HelperAppLauncherDialog_1_9; +version(Tango){ import tango.text.convert.Utf; +} else { // Phobos +} import java.lang.all; import org.eclipse.swt.SWT;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/Mozilla.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/Mozilla.d Fri Mar 27 12:05:20 2009 +0100 @@ -14,10 +14,14 @@ import java.lang.all; + +version(Tango){ import tango.text.locale.Core; import tango.io.Console; import tango.sys.Environment; import tango.stdc.string; +} else { // Phobos +} import org.eclipse.swt.internal.c.gtk;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/MozillaDelegate.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/MozillaDelegate.d Fri Mar 27 12:05:20 2009 +0100 @@ -14,7 +14,10 @@ import java.lang.all; +version(Tango){ import tango.io.Console; +} else { // Phobos +} import org.eclipse.swt.SWT; import org.eclipse.swt.internal.Converter;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/PromptService2.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/browser/PromptService2.d Fri Mar 27 12:05:20 2009 +0100 @@ -12,7 +12,10 @@ *******************************************************************************/ module org.eclipse.swt.browser.PromptService2; +version(Tango){ import tango.stdc.stdlib; +} else { // Phobos +} import java.lang.all;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CCombo.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CCombo.d Fri Mar 27 12:05:20 2009 +0100 @@ -47,9 +47,12 @@ import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; +import java.lang.all; +version(Tango){ static import tango.text.convert.Utf; static import tango.text.Unicode; -import java.lang.all; +} else { // Phobos +} /** * The CCombo class represents a selectable user interface object
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CLabel.d Fri Mar 27 12:05:20 2009 +0100 @@ -40,8 +40,11 @@ import org.eclipse.swt.widgets.Display; import java.lang.all; +version(Tango){ static import tango.text.Unicode; static import tango.text.convert.Utf; +} else { // Phobos +} /** * A Label which supports aligned text and/or an image and different border styles.
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder.d Fri Mar 27 12:05:20 2009 +0100 @@ -48,8 +48,11 @@ import org.eclipse.swt.custom.CTabFolderEvent; import java.lang.all; +version(Tango){ import tango.util.Convert; static import tango.text.convert.Utf; +} else { // Phobos +} /** *
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder2Listener.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolder2Listener.d Fri Mar 27 12:05:20 2009 +0100 @@ -17,8 +17,11 @@ import org.eclipse.swt.internal.SWTEventListener; import org.eclipse.swt.custom.CTabFolderEvent; +version(Tango){ import tango.core.Traits; import tango.core.Tuple; +} else { // Phobos +} /** * Classes which implement this interface provide methods
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderEvent.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderEvent.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,10 @@ import org.eclipse.swt.events.TypedEvent; import org.eclipse.swt.widgets.Widget; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** * This event is sent when an event is generated in the CTabFolder.
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderListener.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/CTabFolderListener.d Fri Mar 27 12:05:20 2009 +0100 @@ -17,8 +17,11 @@ import org.eclipse.swt.internal.SWTEventListener; import org.eclipse.swt.custom.CTabFolderEvent; +version(Tango){ import tango.core.Traits; import tango.core.Tuple; +} else { // Phobos +} /** * Classes which implement this interface provide a method
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/DefaultContent.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/DefaultContent.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,7 +23,10 @@ import org.eclipse.swt.custom.StyledText; import java.lang.all; +version(Tango){ static import tango.io.model.IFile; +} else { // Phobos +} class DefaultContent : StyledTextContent {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/SashFormData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/SashFormData.d Fri Mar 27 12:05:20 2009 +0100 @@ -14,8 +14,11 @@ import java.lang.all; +version(Tango){ static import tango.text.Util; import tango.util.Convert; +} else { // Phobos +} class SashFormData {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StackLayout.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StackLayout.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,8 +23,11 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Layout; +version(Tango){ import tango.util.Convert; static import tango.text.Util; +} else { // Phobos +} /** * This Layout stacks all the controls one on top of the other and resizes all controls
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledText.d Fri Mar 27 12:05:20 2009 +0100 @@ -82,10 +82,13 @@ import org.eclipse.swt.custom.StyledTextListener; import org.eclipse.swt.custom.ST; +version(Tango){ static import tango.text.Util; static import tango.io.model.IFile; static import tango.text.convert.Utf; import tango.util.Convert; +} else { // Phobos +} import java.lang.all;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextDropTargetEffect.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextDropTargetEffect.d Fri Mar 27 12:05:20 2009 +0100 @@ -27,7 +27,6 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.custom.StyledTextContent; -static import tango.core.Exception; import java.lang.all; /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/custom/StyledTextRenderer.d Fri Mar 27 12:05:20 2009 +0100 @@ -40,9 +40,12 @@ import java.lang.all; +version(Tango){ static import tango.text.Util; static import tango.text.convert.Utf; import tango.util.Convert; +} else { // Phobos +} /** * A StyledTextRenderer renders the content of a StyledText widget.
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/Clipboard.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/Clipboard.d Fri Mar 27 12:05:20 2009 +0100 @@ -28,7 +28,10 @@ import java.lang.all; import java.lang.Thread; +version(Tango){ static import tango.stdc.string; +} else { // Phobos +} /** * The <code>Clipboard</code> provides a mechanism for transferring data from one
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/ClipboardProxy.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/ClipboardProxy.d Fri Mar 27 12:05:20 2009 +0100 @@ -26,7 +26,10 @@ import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.TransferData; +version(Tango){ static import tango.stdc.string; +} else { // Phobos +} class ClipboardProxy {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DND.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DND.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,10 @@ import org.eclipse.swt.SWTError; import org.eclipse.swt.SWTException; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** *
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DropTarget.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/DropTarget.d Fri Mar 27 12:05:20 2009 +0100 @@ -39,7 +39,10 @@ import java.lang.all; import java.lang.Thread; +version(Tango){ static import tango.stdc.string; +} else { // Phobos +} /** *
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/HTMLTransfer.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/HTMLTransfer.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,7 +18,10 @@ import org.eclipse.swt.dnd.DND; import java.lang.all; +version(Tango){ static import tango.text.Util; +} else { // Phobos +} /** * The class <code>HTMLTransfer</code> provides a platform specific mechanism
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/RTFTransfer.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/dnd/RTFTransfer.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,10 @@ import org.eclipse.swt.dnd.DND; import java.lang.all; +version(Tango){ static import tango.text.Util; +} else { // Phobos +} /** * The class <code>RTFTransfer</code> provides a platform specific mechanism
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/SelectionListener.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/SelectionListener.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,8 +18,11 @@ public import org.eclipse.swt.internal.SWTEventListener; public import org.eclipse.swt.events.SelectionEvent; +version(Tango){ import tango.core.Traits; import tango.core.Tuple; +} else { // Phobos +} /** * Classes which implement this interface provide methods
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/TypedEvent.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/events/TypedEvent.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,8 +18,11 @@ import org.eclipse.swt.widgets.Widget; import org.eclipse.swt.internal.SWTEventObject; +import java.lang.all; +version(Tango){ import tango.text.Util : split; -import java.lang.all; +} else { // Phobos +} /** * This is the super class for all typed event classes provided
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Cursor.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Cursor.d Fri Mar 27 12:05:20 2009 +0100 @@ -24,7 +24,11 @@ import org.eclipse.swt.internal.gtk.OS; -import tango.stdc.string; +version(Tango){ + import tango.stdc.string; +} else { + import std.c.string; +} /** * Instances of this class manage operating system resources that
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Device.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Device.d Fri Mar 27 12:05:20 2009 +0100 @@ -26,7 +26,6 @@ import org.eclipse.swt.internal.gtk.OS; import java.lang.all; -import tango.core.Exception; /** * This class is the abstract superclass of all device objects,
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/DeviceData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/DeviceData.d Fri Mar 27 12:05:20 2009 +0100 @@ -15,7 +15,6 @@ import java.lang.all; version(Tango){ - //import tango.core.Exception; } else { // Phobos }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/GC.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/GC.d Fri Mar 27 12:05:20 2009 +0100 @@ -38,7 +38,7 @@ import org.eclipse.swt.graphics.LineAttributes; import org.eclipse.swt.internal.gtk.OS; -import org.eclipse.swt.internal.cairo.Cairo; +//import org.eclipse.swt.internal.cairo.Cairo; import org.eclipse.swt.internal.Converter; import org.eclipse.swt.internal.Compatibility; import java.lang.all;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Image.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/Image.d Fri Mar 27 12:05:20 2009 +0100 @@ -31,7 +31,10 @@ import java.io.InputStream; import java.lang.all; +version(Tango){ import tango.stdc.string; +} else { // Phobos +} /** * Instances of this class are graphics which have been prepared @@ -1172,6 +1175,7 @@ /** * Returns a string containing a concise, human-readable * description of the receiver. + import tango.core.Exception; * * @return a string representation of the receiver */
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/ImageLoader.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/ImageLoader.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,8 +23,10 @@ import org.eclipse.swt.internal.Compatibility; import org.eclipse.swt.internal.image.FileFormat; -import tango.core.Exception; +version(Tango){ import tango.core.Array; +} else { // Phobos +} /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/TextStyle.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/graphics/TextStyle.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,10 @@ import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.GlyphMetrics; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** * <code>TextStyle</code> defines a set of styles that can be applied * to a range of text.
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/SWTEventObject.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/SWTEventObject.d Fri Mar 27 12:05:20 2009 +0100 @@ -14,7 +14,6 @@ import java.lang.all; -import tango.core.Exception; import java.util.EventObject; /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/accessibility/gtk/ATK.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/accessibility/gtk/ATK.d Fri Mar 27 12:05:20 2009 +0100 @@ -24,7 +24,10 @@ import org.eclipse.swt.internal.c.atk; import org.eclipse.swt.internal.c.gtk; +version(Tango){ import tango.core.Traits; +} else { // Phobos +} alias org.eclipse.swt.internal.c.atk.AtkObjectFactory AtkObjectFactory; alias org.eclipse.swt.internal.c.atk.AtkObjectClass AtkObjectClass;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/FileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/FileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -32,8 +32,10 @@ import org.eclipse.swt.internal.image.JPEGFileFormat; import org.eclipse.swt.internal.image.PNGFileFormat; -import tango.core.Exception; +version(Tango){ import tango.core.Tuple; +} else { // Phobos +} /** * Abstract factory class for loading/unloading images from files or streams
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/GIFFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/GIFFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -21,7 +21,6 @@ import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.graphics.ImageLoaderEvent; import org.eclipse.swt.graphics.ImageLoader; -import tango.core.Exception; import java.lang.all;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,8 +22,10 @@ import org.eclipse.swt.graphics.RGB; import java.lang.all; -import tango.core.Exception; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} public class JPEGDecoder {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -30,7 +30,6 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.PaletteData; -import tango.core.Exception; final class JPEGFileFormat : FileFormat { int restartInterval;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,6 @@ import org.eclipse.swt.internal.image.JPEGSegment; import org.eclipse.swt.internal.image.LEDataInputStream; -import tango.core.Exception; abstract class JPEGFixedSizeSegment : JPEGSegment {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGSegment.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGSegment.d Fri Mar 27 12:05:20 2009 +0100 @@ -16,7 +16,6 @@ import org.eclipse.swt.internal.image.LEDataOutputStream; -import tango.core.Exception; class JPEGSegment { public byte[] reference;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,7 +18,6 @@ import org.eclipse.swt.internal.image.JPEGSegment; import org.eclipse.swt.internal.image.LEDataInputStream; -import tango.core.Exception; abstract class JPEGVariableSizeSegment : JPEGSegment {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/LEDataInputStream.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/LEDataInputStream.d Fri Mar 27 12:05:20 2009 +0100 @@ -16,7 +16,6 @@ import java.io.InputStream; -import tango.core.Exception; final class LEDataInputStream : InputStream{
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/LZWCodec.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/LZWCodec.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,7 +22,6 @@ import org.eclipse.swt.graphics.ImageLoaderEvent; import java.lang.all; -import tango.core.Exception; final class LZWCodec { int bitsPerPixel, blockSize, blockIndex, currentByte, bitsLeft,
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/OS2BMPFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/OS2BMPFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,7 +22,6 @@ import java.io.ByteArrayOutputStream; import java.lang.all; -import tango.core.Exception; final class OS2BMPFileFormat : FileFormat { static final int BMPFileHeaderSize = 14;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PNGFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PNGFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -33,7 +33,6 @@ import java.io.BufferedInputStream; -import tango.core.Exception; final class PNGFileFormat : FileFormat { static final int SIGNATURE_LENGTH = 8;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngChunk.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngChunk.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,7 +23,6 @@ import org.eclipse.swt.internal.image.PngTrnsChunk; import java.lang.all; -import tango.core.Exception; class PngChunk { byte[] reference;
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngEncoder.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngEncoder.d Fri Mar 27 12:05:20 2009 +0100 @@ -25,7 +25,6 @@ import org.eclipse.swt.internal.Compatibility; import org.eclipse.swt.internal.image.PngChunk; -import tango.core.Exception; final class PngEncoder {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngInputStream.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngInputStream.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,7 +19,6 @@ import org.eclipse.swt.internal.image.PngChunkReader; import org.eclipse.swt.internal.image.PngChunk; -import tango.core.Exception; public class PngInputStream : InputStream {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/TIFFFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/TIFFFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -21,7 +21,6 @@ import org.eclipse.swt.graphics.ImageLoader; import org.eclipse.swt.internal.image.FileFormat; -import tango.core.Exception; /** * Baseline TIFF decoder revision 6.0
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.d Fri Mar 27 12:05:20 2009 +0100 @@ -15,7 +15,6 @@ import java.lang.all; import org.eclipse.swt.internal.image.LEDataInputStream; -import tango.core.Exception; final class TIFFRandomFileAccess {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/WinBMPFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/WinBMPFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -20,7 +20,6 @@ import org.eclipse.swt.SWT; import java.lang.all; -import tango.core.Exception; final class WinBMPFileFormat : FileFormat {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/WinICOFileFormat.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/WinICOFileFormat.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,7 +18,6 @@ import org.eclipse.swt.SWT; import java.lang.all; -import tango.core.Exception; public final class WinICOFileFormat : FileFormat {
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsEmbedString.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsEmbedString.d Fri Mar 27 12:05:20 2009 +0100 @@ -2,7 +2,10 @@ import java.lang.all; +version(Tango){ import Utf = tango.text.convert.Utf; +} else { // Phobos +} import org.eclipse.swt.internal.mozilla.Common; import org.eclipse.swt.internal.mozilla.nsStringAPI; @@ -10,84 +13,84 @@ scope class nsEmbedString { - this(wchar[] s) - { - nsresult result; - result = NS_StringContainerInit2(&str, s.ptr, s.length, 0); - if (XPCOM.NS_FAILED(result)) - throw new Exception("Init string container fail"); - } + this(wchar[] s) + { + nsresult result; + result = NS_StringContainerInit2(&str, s.ptr, s.length, 0); + if (XPCOM.NS_FAILED(result)) + throw new Exception("Init string container fail"); + } - this() - { - nsresult result; - result = NS_StringContainerInit(&str); - if (XPCOM.NS_FAILED(result)) - throw new Exception("Init string container fail"); - } + this() + { + nsresult result; + result = NS_StringContainerInit(&str); + if (XPCOM.NS_FAILED(result)) + throw new Exception("Init string container fail"); + } - nsAString* opCast() - { - return cast(nsAString*)&str; - } + nsAString* opCast() + { + return cast(nsAString*)&str; + } - wchar[] toString16() - { - wchar* buffer = null; - PRBool terminated; - uint len = NS_StringGetData(cast(nsAString*)&str, &buffer, &terminated); - return buffer[0 .. len].dup; - } + wchar[] toString16() + { + wchar* buffer = null; + PRBool terminated; + uint len = NS_StringGetData(cast(nsAString*)&str, &buffer, &terminated); + return buffer[0 .. len].dup; + } char[] toString() { return Utf.toString(this.toString16()); } ~this() - { - NS_StringContainerFinish(&str); - } + { + NS_StringContainerFinish(&str); + } private: - nsStringContainer str; + nsStringContainer str; } scope class nsEmbedCString { - this(char[] s) - { - nsresult result; - result = NS_CStringContainerInit2(&str, s.ptr, s.length, 0); - if (XPCOM.NS_FAILED(result)) - throw new Exception("Init string container fail"); - } + this(char[] s) + { + nsresult result; + result = NS_CStringContainerInit2(&str, s.ptr, s.length, 0); + if (XPCOM.NS_FAILED(result)) + throw new Exception("Init string container fail"); + } - this() - { - nsresult result; - result = NS_CStringContainerInit(&str); - if (XPCOM.NS_FAILED(result)) - throw new Exception("Init string container fail"); - } + this() + { + nsresult result; + result = NS_CStringContainerInit(&str); + if (XPCOM.NS_FAILED(result)) + throw new Exception("Init string container fail"); + } - nsACString* opCast() - { - return cast(nsACString*)&str; - } + nsACString* opCast() + { + return cast(nsACString*)&str; + } - char[] toString() - { - char* buffer = null; - PRBool terminated; - uint len = NS_CStringGetData(cast(nsACString*)&str, &buffer, &terminated); + char[] toString() + { + char* buffer = null; + PRBool terminated; + uint len = NS_CStringGetData(cast(nsACString*)&str, &buffer, &terminated); return buffer[0 .. len].dup; - } + } - ~this() - { - NS_CStringContainerFinish(&str); - } + ~this() + { + NS_CStringContainerFinish(&str); + } private: - nsCStringContainer str; + nsCStringContainer str; }
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsILocalFile.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsILocalFile.d Fri Mar 27 12:05:20 2009 +0100 @@ -10,7 +10,10 @@ import org.eclipse.swt.internal.mozilla.nsIFile; import org.eclipse.swt.internal.mozilla.nsStringAPI; +version(Tango){ import tango.stdc.stdio : FILE; +} else { // Phobos +} const char[] NS_ILOCALFILE_IID_STR = "aa610f20-a889-11d3-8c81-000064657374";
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsStringAPI.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/mozilla/nsStringAPI.d Fri Mar 27 12:05:20 2009 +0100 @@ -2,7 +2,10 @@ import java.lang.all; +version(Tango){ import Utf = tango.text.convert.Utf; +} else { // Phobos +} import org.eclipse.swt.internal.mozilla.Common; extern (System):
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FillLayout.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FillLayout.d Fri Mar 27 12:05:20 2009 +0100 @@ -21,8 +21,11 @@ import org.eclipse.swt.widgets.Scrollable; import org.eclipse.swt.layout.FillData; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * <code>FillLayout</code> is the simplest layout class. It lays out
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormData.d Fri Mar 27 12:05:20 2009 +0100 @@ -18,8 +18,11 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.layout.FormAttachment; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * Instances of this class are used to define the attachments
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/FormLayout.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,8 +22,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Scrollable; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * Instances of this class control the position and size of the
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridData.d Fri Mar 27 12:05:20 2009 +0100 @@ -16,8 +16,11 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Control; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * <code>GridData</code> is the layout data object associated with
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridLayout.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/GridLayout.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,8 +22,11 @@ import org.eclipse.swt.widgets.Scrollable; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowData.d Fri Mar 27 12:05:20 2009 +0100 @@ -16,8 +16,11 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Control; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * Each control controlled by a <code>RowLayout</code> can have its initial
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowLayout.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/layout/RowLayout.d Fri Mar 27 12:05:20 2009 +0100 @@ -19,8 +19,11 @@ import org.eclipse.swt.widgets.Layout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.layout.RowData; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/opengl/GLData.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/opengl/GLData.d Fri Mar 27 12:05:20 2009 +0100 @@ -15,8 +15,11 @@ import java.lang.all; +version(Tango){ import tango.text.Util; import tango.util.Convert; +} else { // Phobos +} /** * The GLData class is a device-independent description
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/PrintDialog.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/PrintDialog.d Fri Mar 27 12:05:20 2009 +0100 @@ -26,7 +26,10 @@ import org.eclipse.swt.printing.PrinterData; import java.lang.all; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** * Instances of this class allow the user to select
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/Printer.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/printing/Printer.d Fri Mar 27 12:05:20 2009 +0100 @@ -28,7 +28,10 @@ import org.eclipse.swt.printing.PrinterData; import java.lang.all; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/program/Program.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/program/Program.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,11 +23,13 @@ import org.eclipse.swt.widgets.Listener; import java.lang.all; +version(Tango){ import tango.sys.SharedLib; -import tango.core.Exception; import tango.core.Array; import tango.io.device.File; import tango.io.stream.Lines; +} else { // Phobos +} version( build ){ pragma(link, "gnomeui-2" );
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DateTime.d Fri Mar 27 12:05:20 2009 +0100 @@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.TypedListener; +version(Tango){ import tango.util.Convert; import java.lang.all; @@ -40,6 +41,8 @@ static import tango.time.WallClock; static import tango.time.chrono.Gregorian; static import tango.time.chrono.Calendar; +} else { // Phobos +} private class Calendar{
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DirectoryDialog.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/DirectoryDialog.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,8 +23,11 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Display; +version(Tango){ static import tango.io.model.IFile; static import tango.text.Util; +} else { // Phobos +} /** * Instances of this class allow the user to navigate
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Display.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Display.d Fri Mar 27 12:05:20 2009 +0100 @@ -43,10 +43,13 @@ import org.eclipse.swt.widgets.Tray; import org.eclipse.swt.widgets.Widget; -import tango.stdc.string; import java.lang.all; import java.lang.Thread; +version(Tango){ +import tango.stdc.string; +} else { // Phobos +} /** * Instances of this class are responsible for managing the
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/FileDialog.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/FileDialog.d Fri Mar 27 12:05:20 2009 +0100 @@ -22,8 +22,11 @@ import org.eclipse.swt.widgets.Display; import java.lang.all; +version(Tango){ static import tango.io.model.IFile; static import tango.text.Util; +} else { // Phobos +} /** * Instances of this class allow the user to navigate
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Link.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Link.d Fri Mar 27 12:05:20 2009 +0100 @@ -41,7 +41,10 @@ import org.eclipse.swt.widgets.Event; import java.lang.all; +version(Tango){ import tango.text.Unicode; +} else { // Phobos +} /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/List.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/List.d Fri Mar 27 12:05:20 2009 +0100 @@ -25,7 +25,10 @@ import org.eclipse.swt.widgets.Display; import java.lang.all; +version(Tango){ import tango.text.convert.Integer; +} else { // Phobos +} /** * Instances of this class represent a selectable user interface
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Listener.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Listener.d Fri Mar 27 12:05:20 2009 +0100 @@ -16,8 +16,11 @@ import org.eclipse.swt.widgets.Event; +version(Tango){ import tango.core.Traits; import tango.core.Tuple; +} else { // Phobos +} /** * Implementers of <code>Listener</code> provide a simple
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/RunnableLock.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/RunnableLock.d Fri Mar 27 12:05:20 2009 +0100 @@ -15,9 +15,11 @@ import java.lang.all; import java.lang.Thread; -import tango.core.Exception; +version(Tango){ import tango.core.sync.Condition; import tango.core.sync.Mutex; +} else { // Phobos +} /** * Instances of this class are used to ensure that an
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Scrollable.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Scrollable.d Fri Mar 27 12:05:20 2009 +0100 @@ -23,7 +23,10 @@ import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Widget; +version(Tango){ import tango.stdc.string; +} else { // Phobos +} /** * This class is the abstract superclass of all classes which
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Shell.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Shell.d Fri Mar 27 12:05:20 2009 +0100 @@ -42,7 +42,10 @@ import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; +version(Tango){ import Unicode = tango.text.Unicode; +} else { // Phobos +} /** * Instances of this class represent the "windows"
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Spinner.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Spinner.d Fri Mar 27 12:05:20 2009 +0100 @@ -26,8 +26,11 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.VerifyListener; +import java.lang.all; +version(Tango){ import tango.util.Convert; -import java.lang.all; +} else { // Phobos +} /** * Instances of this class are selectable user interface
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Synchronizer.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Synchronizer.d Fri Mar 27 12:05:20 2009 +0100 @@ -20,7 +20,10 @@ import org.eclipse.swt.SWT; import java.lang.Thread; import org.eclipse.swt.graphics.Device; +version(Tango){ import tango.core.Exception; +} else { // Phobos +} /** * Instances of this class provide synchronization support
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Table.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Table.d Fri Mar 27 12:05:20 2009 +0100 @@ -40,7 +40,10 @@ import org.eclipse.swt.widgets.TypedListener; import java.lang.all; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** * Instances of this class implement a selectable user interface
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Text.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Text.d Fri Mar 27 12:05:20 2009 +0100 @@ -27,7 +27,10 @@ import org.eclipse.swt.widgets.Scrollable; import org.eclipse.swt.widgets.Composite; +version(Tango){ static import tango.stdc.string; +} else { // Phobos +} /** * Instances of this class are selectable user interface
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Tracker.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Tracker.d Fri Mar 27 12:05:20 2009 +0100 @@ -30,7 +30,6 @@ import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Event; -import tango.core.Exception; import java.lang.Thread; /**
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TrayItem.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/TrayItem.d Fri Mar 27 12:05:20 2009 +0100 @@ -28,7 +28,10 @@ import org.eclipse.swt.graphics.Region; import org.eclipse.swt.internal.gtk.OS; +version(Tango){ import tango.util.Convert; +} else { // Phobos +} /** * Instances of this class represent icons that can be placed on the
--- a/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d Fri Mar 27 11:43:53 2009 +0100 +++ b/org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/widgets/Widget.d Fri Mar 27 12:05:20 2009 +0100 @@ -25,8 +25,11 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.TypedListener; +import java.lang.Thread; +version(Tango){ import tango.stdc.string; -import java.lang.Thread; +} else { // Phobos +} /**