diff dwtx/ui/internal/forms/widgets/FormHeading.d @ 76:e193036d82c9

Fix continue porting
author Frank Benoit <benoit@tionex.de>
date Sat, 24 May 2008 06:18:55 +0200
parents 5d489b9f966c
children 04b47443bb01
line wrap: on
line diff
--- a/dwtx/ui/internal/forms/widgets/FormHeading.d	Sat May 24 05:11:16 2008 +0200
+++ b/dwtx/ui/internal/forms/widgets/FormHeading.d	Sat May 24 06:18:55 2008 +0200
@@ -13,6 +13,8 @@
 module dwtx.ui.internal.forms.widgets.FormHeading;
 
 import dwtx.ui.internal.forms.widgets.TitleRegion;
+import dwtx.ui.internal.forms.widgets.FormImages;
+import dwtx.ui.internal.forms.widgets.FormsResources;
 
 import dwt.DWT;
 import dwt.custom.CLabel;
@@ -90,11 +92,11 @@
 
     private ToolBarManager toolBarManager;
 
-    private SizeCache toolbarCache = new SizeCache();
+    private SizeCache toolbarCache;
 
-    private SizeCache clientCache = new SizeCache();
+    private SizeCache clientCache;
 
-    private SizeCache messageCache = new SizeCache();
+    private SizeCache messageCache;
 
     private TitleRegion titleRegion;
 
@@ -115,7 +117,7 @@
             if (messageRegion !is null)
                 messageRegion.updateToolTip(details);
             if (getMessageType() > 0
-                    && (details is null || details.length() is 0))
+                    && (details is null || details.length is 0))
                 details = getMessage();
             titleRegion.updateToolTip(details);
         }
@@ -341,7 +343,11 @@
             return size;
         }
     }
-
+    this(){
+        toolbarCache = new SizeCache();
+        clientCache = new SizeCache();
+        messageCache = new SizeCache();
+    }
     /* (non-Javadoc)
      * @see dwt.widgets.Control#forceFocus()
      */
@@ -426,7 +432,7 @@
             ensureControlExists();
             if (needHyperlink()) {
                 messageHyperlink.setText(newMessage);
-                messageHyperlink.setHref(messages);
+                messageHyperlink.setHref(new ArrayWrapperT!(IMessage)(messages));
             } else {
                 messageLabel.setText(newMessage);
             }
@@ -481,7 +487,7 @@
         public void addMessageHyperlinkListener(IHyperlinkListener listener) {
             if (listeners is null)
                 listeners = new ListenerList();
-            listeners.add(listener);
+            listeners.add(cast(Object)listener);
             ensureControlExists();
             if (messageHyperlink !is null)
                 messageHyperlink.addHyperlinkListener(listener);
@@ -491,7 +497,7 @@
 
         private void removeMessageHyperlinkListener(IHyperlinkListener listener) {
             if (listeners !is null) {
-                listeners.remove(listener);
+                listeners.remove(cast(Object)listener);
                 if (messageHyperlink !is null)
                     messageHyperlink.removeHyperlinkListener(listener);
                 if (listeners.isEmpty())
@@ -510,7 +516,7 @@
                     messageHyperlink = new Hyperlink(this.outer, DWT.NULL);
                     messageHyperlink.setUnderlined(true);
                     messageHyperlink.setText(message);
-                    messageHyperlink.setHref(messages);
+                    messageHyperlink.setHref(new ArrayWrapperT!(IMessage)(messages));
                     Object[] llist = listeners.getListeners();
                     for (int i = 0; i < llist.length; i++)
                         messageHyperlink
@@ -519,7 +525,7 @@
                         messageToolTipManager.createToolTip(messageHyperlink, false);
                 } else if (!messageHyperlink.getVisible()) {
                     messageHyperlink.setText(message);
-                    messageHyperlink.setHref(messages);
+                    messageHyperlink.setHref(new ArrayWrapperT!(IMessage)(messages));
                     messageHyperlink.setVisible(true);
                 }
             } else {
@@ -991,9 +997,9 @@
 
     public void putColor(String key, Color color) {
         if (color is null)
-            colors.remove(key);
+            colors.removeKey(key);
         else
-            colors.put(key, color);
+            colors.add(key, color);
     }
 
     public Color getColor(String key) {