changeset 59:6fb20f548c46

Fix compile error
author Frank Benoit <benoit@tionex.de>
date Thu, 10 Apr 2008 09:32:17 +0200
parents 3b18f03b2f41
children 6e6405809faf
files dsss.conf dwtexamples/addressbook/DataEntryDialog.d dwtsnippets/tray/Snippet143.d jface/ActionAndStatusbar.d
diffstat 4 files changed, 12 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dsss.conf	Thu Apr 10 09:12:59 2008 +0200
+++ b/dsss.conf	Thu Apr 10 09:32:17 2008 +0200
@@ -48,6 +48,7 @@
 [dwtsnippets/menu/Snippet97.d]
 [dwtsnippets/menu/Snippet152.d]
 [dwtsnippets/menu/Snippet286.d]
+[dwtsnippets/program/Snippet32.d]
 [dwtsnippets/sash/Snippet107.d]
 [dwtsnippets/sashform/Snippet109.d]
 [dwtsnippets/shell/Snippet134.d]
@@ -69,7 +70,6 @@
 [dwtsnippets/tray/Snippet143.d]
 [dwtsnippets/tree/Snippet8.d]
 [dwtsnippets/tree/Snippet15.d]
-[dwtsnippets/program/Snippet32.d]
 
 [user/dragdrop/texttolabel.d]
 [user/drawingboard/DrawingBoard.d]
@@ -78,6 +78,7 @@
 
 version(DwtAddons){
     [dwtexamples/sleak/SleakExample.d]
+    [jface/ActionAndStatusbar.d]
 }
 
 version(Derelict){
@@ -120,6 +121,3 @@
 buildflags+=-Jdwtexamples/texteditor
 
 
-[jface/ActionAndStatusbar.d]
-
-
--- a/dwtexamples/addressbook/DataEntryDialog.d	Thu Apr 10 09:12:59 2008 +0200
+++ b/dwtexamples/addressbook/DataEntryDialog.d	Thu Apr 10 09:32:17 2008 +0200
@@ -25,7 +25,7 @@
 import dwt.widgets.Text;
 
 import dwt.dwthelper.ResourceBundle;
-import dwt.dwthelper.Integer;
+import dwt.dwthelper.utils;
 
 /**
  * DataEntryDialog class uses <code>org.eclipse.swt</code>
--- a/dwtsnippets/tray/Snippet143.d	Thu Apr 10 09:12:59 2008 +0200
+++ b/dwtsnippets/tray/Snippet143.d	Thu Apr 10 09:32:17 2008 +0200
@@ -11,13 +11,13 @@
  *     Frank Benoit <benoit@tionex.de>
  *******************************************************************************/
 module dwt.snippets.tray.Snippet143;
-  
+
 /*
  * Tray example snippet: place an icon with a popup menu on the system tray
  *
  * For a list of all DWT example snippets see
  * http://www.eclipse.org/swt/snippets/
- * 
+ *
  * @since 3.0
  */
 import dwt.DWT;
@@ -41,7 +41,7 @@
     Shell shell = new Shell (display);
     Image image = new Image (display, 16, 16);
     final Tray tray = display.getSystemTray ();
-    if (tray == null) {
+    if (tray is null) {
         Stdout.formatln ("The system tray is not available");
     } else {
         item = new TrayItem (tray, DWT.NONE);
--- a/jface/ActionAndStatusbar.d	Thu Apr 10 09:12:59 2008 +0200
+++ b/jface/ActionAndStatusbar.d	Thu Apr 10 09:32:17 2008 +0200
@@ -10,7 +10,7 @@
 Port to the D programming language:
     Frank Benoit <benoit@tionex.de>
 */
-module jfacestatusbar;
+module jface.ActionAndStatusbar;
 
 import dwtx.jface.action.Action;
 import dwtx.jface.action.ActionContributionItem;
@@ -31,23 +31,23 @@
 import dwt.dwthelper.Runnable;
 
 void main() {
-    Ch4_Contributions swin = new Ch4_Contributions();
+    auto swin = new ActionAndStatusbar();
     swin.setBlockOnOpen(true);
     swin.open();
     Display.getCurrent().dispose();
 }
 
-public class Ch4_Contributions : ApplicationWindow {
+public class ActionAndStatusbar : ApplicationWindow {
     StatusLineManager slm;
 
-    Ch4_StatusAction status_action;
+    StatusAction status_action;
 
     ActionContributionItem aci;
 
     public this() {
         super(null);
         slm = new StatusLineManager();
-        status_action = new Ch4_StatusAction(slm);
+        status_action = new StatusAction(slm);
         aci = new ActionContributionItem(status_action);
         addStatusLine();
         addMenuBar();
@@ -80,7 +80,7 @@
     }
 }
 
-class Ch4_StatusAction : Action {
+class StatusAction : Action {
     StatusLineManager statman;
 
     short triggercount = 0;
@@ -91,7 +91,6 @@
         setToolTipText("Trigger the Action");
         setImageDescriptor(ImageDescriptor.createFromFile(
             getImportData!("eclipse-icon-red-16.png")));
-            //getImportData!("cancel.gif")));
     }
 
     public void run() {