Mercurial > projects > dwt2

diff org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/gdip/Gdip.d @ 39:0ecb2b338560

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
further work on phobosification
author Frank Benoit <benoit@tionex.de>
date Wed, 25 Mar 2009 13:20:43 +0100
parents 4642ab680468
children 536e43f63c81
line wrap: on
line diff
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/gdip/Gdip.d	Wed Mar 25 11:18:25 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/gdip/Gdip.d	Wed Mar 25 13:20:43 2009 +0100
@@ -575,7 +575,7 @@
 
     **************************************************************************/
 
-    static Bitmap Bitmap_new( wchar* filename, bool useIcm )
+    static Bitmap Bitmap_new( LPCWSTR filename, bool useIcm )
     {
         Bitmap bitmap;
         if (useIcm) {
@@ -1088,7 +1088,7 @@
 
 **************************************************************************/
 
-    static int FontFamily_GetFamilyName( FontFamily family, wchar* name, int language )
+    static int FontFamily_GetFamilyName( FontFamily family, LPCWSTR name, int language )
     {
         return SetStatus( GdipGetFamilyName( family, name, language ) );
     }
@@ -1181,9 +1181,9 @@
         if (hfont is null) {
             Gdip.lastResult = GdipCreateFontFromDC( hdc, font );
         } else {
-            LOGFONTA logfont;
-            if (GetObjectA( hfont, LOGFONTA.sizeof, &logfont ))
-                Gdip.lastResult = GdipCreateFontFromLogfontA(hdc, logfont, font);
+            LOGFONTW logfont;
+            if (OS.GetObject( hfont, LOGFONTW.sizeof, &logfont ))
+                Gdip.lastResult = GdipCreateFontFromLogfontW(hdc, logfont, font);
             else
                 Gdip.lastResult = GdipCreateFontFromDC(hdc, font);
         }
@@ -1196,7 +1196,7 @@
 
     **************************************************************************/
 
-    static Font Font_new( wchar* familyName, float emSize, int style, uint unit,
+    static Font Font_new( LPCWSTR familyName, float emSize, int style, uint unit,
                           FontCollection fontCollection  )
     {
         Font        nativeFont = null;
@@ -1375,7 +1375,7 @@
 
     **************************************************************************/
 
-    static Status GraphicsPath_AddString( Path path, wchar* string,
+    static Status GraphicsPath_AddString( Path path, LPCWSTR string,
                                           int length, FontFamily family,
                                           int style, float emSize,
                                           ref PointF origin, StringFormat format )
@@ -1648,7 +1648,7 @@
 
     **************************************************************************/
 
-    static Status Graphics_DrawString( Graphics graphics, wchar* string, int length,
+    static Status Graphics_DrawString( Graphics graphics, LPCWSTR string, int length,
                                        Font font, ref PointF origin, Brush brush  )
     {
         RectF rect = {origin.X, origin.Y, 0.0f, 0.0f};
@@ -1660,7 +1660,7 @@
 
     **************************************************************************/
 
-    static Status Graphics_DrawString( Graphics graphics, wchar* string, int length,
+    static Status Graphics_DrawString( Graphics graphics, LPCWSTR string, int length,
                                        Font font, ref PointF origin,
                                        StringFormat format, Brush brush )
     {
@@ -1846,7 +1846,7 @@
 
     **************************************************************************/
 
-    static Status Graphics_MeasureString( Graphics graphics, wchar* string, int length,
+    static Status Graphics_MeasureString( Graphics graphics, LPCWSTR string, int length,
                                           Font font, ref PointF origin,
                                           ref RectF boundingBox )
     {
@@ -1869,7 +1869,7 @@
 
     **************************************************************************/
 
-    static Status Graphics_MeasureString( Graphics graphics, wchar* string, int length,
+    static Status Graphics_MeasureString( Graphics graphics, LPCWSTR string, int length,
                                           Font font, ref PointF origin,
                                           StringFormat format, ref RectF boundingBox )
     {