Mercurial > projects > dwt2

diff org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Shell.d @ 38:2e09b0e6857a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
work on phobosfication
author Frank Benoit <benoit@tionex.de>
date Wed, 25 Mar 2009 11:18:25 +0100
parents d46287db17ed
children 0ecb2b338560
line wrap: on
line diff
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Shell.d	Wed Mar 25 08:46:48 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Shell.d	Wed Mar 25 11:18:25 2009 +0100
@@ -159,10 +159,14 @@
     static /+const+/ WNDPROC ToolTipProc;
     static /+const+/ WNDPROC DialogProc;
     static if( OS.IsWinCE ){
-        static const TCHAR[] DialogClass = "Dialog\0"w;
+        static const StringT DialogClass = "Dialog\0"w;
     }
     else{
-        static const TCHAR[] DialogClass = "#32770\0"w;
+        version(D_Version2){
+            static StringT DialogClass = "#32770\0"w;
+        } else { // D1
+            static const StringT DialogClass = "#32770\0"w;
+        }
     }
     const static int [] SYSTEM_COLORS = [
         OS.COLOR_BTNFACE,
@@ -1687,7 +1691,7 @@
     }
 }
 
-void setToolTipText (NMTTDISPINFO* lpnmtdi, CHAR [] buffer) {
+void setToolTipText (NMTTDISPINFO* lpnmtdi, CCHAR [] buffer) {
     /*
     * Ensure that the current position of the mouse
     * is inside the client area of the shell.  This
@@ -1703,7 +1707,7 @@
     lpnmtdi.lpszText = lpstrTip;
 }
 
-void setToolTipText (NMTTDISPINFO* lpnmtdi, WCHAR [] buffer) {
+void setToolTipText (NMTTDISPINFO* lpnmtdi, CWCHAR [] buffer) {
     /*
     * Ensure that the current position of the mouse
     * is inside the client area of the shell.  This