Mercurial > projects > dwt-mac

changeset 136:1a0129cab08e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes #5
author Jacob Carlborg <doob@me.com>
date Sat, 30 May 2009 21:38:21 +0200
parents 04928add86e6
children 52d360200ae4
files .hgignore dsss.conf dwt/graphics/TextLayout.d dwt/widgets/Button.d dwt/widgets/MessageBox.d dwt/widgets/ScrollBar.d dwt/widgets/Tree.d
diffstat 7 files changed, 26 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Sun May 24 22:24:42 2009 +0200
+++ b/.hgignore	Sat May 30 21:38:21 2009 +0200
@@ -8,4 +8,5 @@
 *.sh
 *.a
 *.rf
-*.dylib
\ No newline at end of file
+*.dylib
+snippets.txt
\ No newline at end of file
--- a/dsss.conf	Sun May 24 22:24:42 2009 +0200
+++ b/dsss.conf	Sat May 30 21:38:21 2009 +0200
@@ -6,4 +6,8 @@
 
 version (LDC){
     buildflags += -Jres -L-framework=Cocoa -L-framework=Carbon
+}
+
+version (DMD){
+    buildflags += -Jres -L-framework -LCocoa -L-framework -LCarbon -version=darwin
 }
\ No newline at end of file
--- a/dwt/graphics/TextLayout.d	Sun May 24 22:24:42 2009 +0200
+++ b/dwt/graphics/TextLayout.d	Sat May 30 21:38:21 2009 +0200
@@ -196,6 +196,7 @@
                 break;
             case DWT.RIGHT:
                 align_ = OS.NSRightTextAlignment;
+            default:
         }
     }
     paragraph.setAlignment(align_);
--- a/dwt/widgets/Button.d	Sun May 24 22:24:42 2009 +0200
+++ b/dwt/widgets/Button.d	Sat May 30 21:38:21 2009 +0200
@@ -82,6 +82,7 @@
 
     alias Control.setBackground setBackground;
     alias Control.setForeground setForeground;
+    alias Control.computeSize computeSize;
     
     String text = "";
     Image image;
--- a/dwt/widgets/MessageBox.d	Sun May 24 22:24:42 2009 +0200
+++ b/dwt/widgets/MessageBox.d	Sat May 30 21:38:21 2009 +0200
@@ -163,34 +163,34 @@
         case DWT.OK:
             break;
         case DWT.CANCEL:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Cancel"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Cancel"));
             break;
         case DWT.OK | DWT.CANCEL:
-            alternateButton = NSString.stringWith(DWT.getMessage("DWT_Cancel"));
+            alternateButton = NSString.stringWith(DWT.getMessage("SWT_Cancel"));
             break;
         case DWT.YES:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Yes"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Yes"));
             break;
         case DWT.NO:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_No"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_No"));
             break;
         case DWT.YES | DWT.NO:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Yes"));
-            alternateButton = NSString.stringWith(DWT.getMessage("DWT_No"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Yes"));
+            alternateButton = NSString.stringWith(DWT.getMessage("SWT_No"));
             break;
         case DWT.YES | DWT.NO | DWT.CANCEL:             
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Yes"));
-            alternateButton = NSString.stringWith(DWT.getMessage("DWT_No"));
-            otherButton = NSString.stringWith(DWT.getMessage("DWT_Cancel"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Yes"));
+            alternateButton = NSString.stringWith(DWT.getMessage("SWT_No"));
+            otherButton = NSString.stringWith(DWT.getMessage("SWT_Cancel"));
             break;
         case DWT.RETRY | DWT.CANCEL:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Retry"));
-            alternateButton = NSString.stringWith(DWT.getMessage("DWT_Cancel"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Retry"));
+            alternateButton = NSString.stringWith(DWT.getMessage("SWT_Cancel"));
             break;
         case DWT.ABORT | DWT.RETRY | DWT.IGNORE:
-            defaultButton = NSString.stringWith(DWT.getMessage("DWT_Abort"));
-            alternateButton = NSString.stringWith(DWT.getMessage("DWT_Retry"));
-            otherButton = NSString.stringWith(DWT.getMessage("DWT_Ignore"));
+            defaultButton = NSString.stringWith(DWT.getMessage("SWT_Abort"));
+            alternateButton = NSString.stringWith(DWT.getMessage("SWT_Retry"));
+            otherButton = NSString.stringWith(DWT.getMessage("SWT_Ignore"));
             break;
         default:
     }
--- a/dwt/widgets/ScrollBar.d	Sun May 24 22:24:42 2009 +0200
+++ b/dwt/widgets/ScrollBar.d	Sat May 30 21:38:21 2009 +0200
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -451,7 +451,6 @@
             event.detail = DWT.DRAG;
             break;
         default:
-            assert(false);
     }
     if (target is null) {
         if (event.detail !is DWT.DRAG) {
--- a/dwt/widgets/Tree.d	Sun May 24 22:24:42 2009 +0200
+++ b/dwt/widgets/Tree.d	Sat May 30 21:38:21 2009 +0200
@@ -130,6 +130,9 @@
  * @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
  */
 public class Tree : Composite {
+
+    alias Composite.computeSize computeSize;
+    
     NSTableColumn firstColumn, checkColumn;
     NSBrowserCell dataCell;
     NSTableHeaderView headerView;