diff dwtx/ui/internal/forms/widgets/FormUtil.d @ 77:26c6c9dfd13c

ui.forms compile, just FormTextModel with xml reimpl left todo
author Frank Benoit <benoit@tionex.de>
date Sat, 24 May 2008 06:59:31 +0200
parents 5d489b9f966c
children 4ac9946b9fb5
line wrap: on
line diff
--- a/dwtx/ui/internal/forms/widgets/FormUtil.d	Sat May 24 06:18:55 2008 +0200
+++ b/dwtx/ui/internal/forms/widgets/FormUtil.d	Sat May 24 06:59:31 2008 +0200
@@ -75,12 +75,12 @@
 
     static const int V_SCROLL_INCREMENT = 64;
 
-    public static const String DEBUG = PLUGIN_ID + "/debug"; //$NON-NLS-1$
+    public static const String DEBUG = PLUGIN_ID ~ "/debug"; //$NON-NLS-1$
 
-    public static const String DEBUG_TEXT = DEBUG + "/text"; //$NON-NLS-1$
-    public static const String DEBUG_TEXTSIZE = DEBUG + "/textsize"; //$NON-NLS-1$
+    public static const String DEBUG_TEXT = DEBUG ~ "/text"; //$NON-NLS-1$
+    public static const String DEBUG_TEXTSIZE = DEBUG ~ "/textsize"; //$NON-NLS-1$
 
-    public static const String DEBUG_FOCUS = DEBUG + "/focus"; //$NON-NLS-1$
+    public static const String DEBUG_FOCUS = DEBUG ~ "/focus"; //$NON-NLS-1$
 
     public static const String FOCUS_SCROLLING = "focusScrolling"; //$NON-NLS-1$
 
@@ -247,7 +247,7 @@
         ScrolledComposite scomp = getScrolledComposite(c);
         if (scomp !is null) {
             Object data = scomp.getData(FOCUS_SCROLLING);
-            if (data is null || !data.equals(Boolean.FALSE))
+            if (data is null || !data.opEquals(Boolean.FALSE))
                 FormUtil.ensureVisible(scomp, c);
         }
     }
@@ -510,16 +510,16 @@
         return new Image(device, data);
     }
 
-    public static bool mnemonicMatch(String text, char key) {
+    public static bool mnemonicMatch(String text, dchar key) {
         char mnemonic = findMnemonic(text);
         if (mnemonic is '\0')
             return false;
-        return Character.toUpperCase(key) is Character.toUpperCase(mnemonic);
+        return CharacterToUpper(key) is CharacterToUpper(mnemonic);
     }
 
     private static char findMnemonic(String string) {
         int index = 0;
-        int length = string.length();
+        int length = string.length;
         do {
             while (index < length && string.charAt(index) !is '&')
                 index++;