Changeset 265 for trunk/src/user32/dlgconvert.cpp

Timestamp:

Jul 4, 1999, 9:03:36 PM (26 years ago)

Author:

sandervl

Message:

Dialog changes + fixes

File:

• trunk/src/user32/dlgconvert.cpp (modified) (5 diffs)

trunk/src/user32/dlgconvert.cpp

@@ -1 @@
-/* $Id: dlgconvert.cpp,v 1.6 1999-07-02 12:42:57 sandervl Exp $ */
+/* $Id: dlgconvert.cpp,v 1.7 1999-07-04 19:02:38 sandervl Exp $ */
 
 /*
@@ -41 +41 @@
 #endif
 
+#define DEFAULT_DLGFONT "9.WarpSans"
+
 static int   ConvertClassAndStyle(int winclass, int style, USHORT *os2class, BOOL *fIconBmp);
 static int   ConvertDlgStyle(int style);
@@ -244 +246 @@
       dlgt->coffPresParams    = (int)dlgpparam;
       dlgcurdata += sizeof(PRESPARAMS) + dlgpparam->aparam[0].cb - 1;
+   }  else
+   { //CB: set default font
+     dlgpparam = (PRESPARAMS*)dlgcurdata;
+     dlgpparam->aparam[0].id = PP_FONTNAMESIZE;
+     dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1;
+     strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT);
+     dlgpparam->cb           = dlgpparam->aparam[0].cb+2*sizeof(ULONG);
+     dlgitem->offPresParams  = (USHORT)((int)dlgpparam-(int)dlgt);
+     dlgt->coffPresParams++;
+     dlgcurdata             += dlgpparam->cb+sizeof(dlgpparam->cb);
    }
    FreeAsciiString(font);
+  }  else
+  { //CB: set default font
+    dlgpparam = (PRESPARAMS*)dlgcurdata;
+    dlgpparam->aparam[0].id = PP_FONTNAMESIZE;
+    dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1;
+    strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT);
+    dlgpparam->cb           = dlgpparam->aparam[0].cb+2*sizeof(ULONG);
+    dlgitem->offPresParams  = (USHORT)((int)dlgpparam-(int)dlgt);
+    dlgt->coffPresParams++;
+    dlgcurdata             += dlgpparam->cb+sizeof(dlgpparam->cb);
   }
   ctrldata = (ControlData *)(((int)ctrldata+3) & ~3);
@@ -300 +322 @@
    if(*(USHORT *)szCaption == 0xFFFF) {
       szCaption += 2;
+      dlgitem->cchText = 0;
+      dlgitem->offText = (USHORT)((int)dlgcurdata-(int)dlgt);
+      dlgcurdata += 1; //CB: offText == empty string
    }
    else {   //Handle Caption
@@ -521 +546 @@
       dlgt->coffPresParams    = (int)dlgpparam;
       dlgcurdata += sizeof(PRESPARAMS) + dlgpparam->aparam[0].cb - 1;
+   } else
+   { //CB: set default font
+     dlgpparam = (PRESPARAMS*)dlgcurdata;
+     dlgpparam->aparam[0].id = PP_FONTNAMESIZE;
+     dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1;
+     strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT);
+     dlgpparam->cb           = dlgpparam->aparam[0].cb+2*sizeof(ULONG);
+     dlgitem->offPresParams  = (USHORT)((int)dlgpparam-(int)dlgt);
+     dlgt->coffPresParams++;
+     dlgcurdata             += dlgpparam->cb+sizeof(dlgpparam->cb);
    }
    FreeAsciiString(font);
+  } else
+  { //CB: set default font
+    dlgpparam = (PRESPARAMS*)dlgcurdata;
+    dlgpparam->aparam[0].id = PP_FONTNAMESIZE;
+    dlgpparam->aparam[0].cb = strlen(DEFAULT_DLGFONT)+1;
+    strcpy((char*)&dlgpparam->aparam[0].ab,DEFAULT_DLGFONT);
+    dlgpparam->cb           = dlgpparam->aparam[0].cb+2*sizeof(ULONG);
+    dlgitem->offPresParams  = (USHORT)((int)dlgpparam-(int)dlgt);
+    dlgt->coffPresParams++;
+    dlgcurdata             += dlgpparam->cb+sizeof(dlgpparam->cb);
   }
   ctrldata = (WINDLGITEMTEMPLATEEX *)(((int)ctrldata+3) & ~3);