Changeset 208 for trunk/src

Timestamp:

Oct 17, 2009, 2:42:39 AM (16 years ago)

Author:

lpino

Message:

• Fix the ControlExample

File:

• trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/FontDialog.java (modified) (2 diffs)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/FontDialog.java

@@ -119 +119 @@
          fontDlg.cbSize = FONTDLG.sizeof;
          //Init from FATTRS
-         fontDlg.fl = OS.FNTS_CENTER|OS.FNTS_INITFROMFATTRS;
+         fontDlg.fl = OS.FNTS_CENTER;
          //Size fontname buffer
          fontDlg.usFamilyBufLen = OS.FACESIZE;
+         
          //Fontname buffer
          byte[] szCurrentFont = new byte[OS.FACESIZE];
-         byte[] buffer = fontData.getName().getBytes();
-         for(int i=0;i<buffer.length&&i<szCurrentFont.length;i++)
-             szCurrentFont[i] = buffer[i];
+         
+         if (fontData != null) {
+                 fontDlg.fl |= OS.FNTS_INITFROMFATTRS;
+                 byte[] buffer = fontData.getName().getBytes();
+                 for(int i=0;i<buffer.length&&i<szCurrentFont.length;i++)
+                     szCurrentFont[i] = buffer[i];
+                 fontDlg.fAttrs = fontData.getFAttrs();
+         } else {
+                 szCurrentFont[0] = ' ';
+         }
          fontDlg.pszFamilyname = new PSZ(szCurrentFont);
          //Foreground color
@@ -136 +144 @@
          //Text shown in the preview area
          fontDlg.pszPreview = new PSZ("Eclipse/2");
-         if (fontData != null) {
-                 fontDlg.fAttrs = fontData.getFAttrs();
-         }
          int rc = OS.WinFontDlg(OS.HWND_DESKTOP, hwndOwner, fontDlg);
          if(fontDlg.lReturn == OS.DID_OK){