Changeset 265 for trunk/src/pe2lx/dialog.cpp

Timestamp:

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

Author:

sandervl

Message:

Dialog changes + fixes

File:

• trunk/src/pe2lx/dialog.cpp (modified) (7 diffs)

trunk/src/pe2lx/dialog.cpp

@@ -1 @@
-/* $Id: dialog.cpp,v 1.5 1999-07-02 12:43:30 sandervl Exp $ */
+/* $Id: dialog.cpp,v 1.6 1999-07-04 19:02:37 sandervl Exp $ */
 
 /*
@@ -33 +33 @@
 #endif
 
+#define DEFAULT_DLGFONT "9.WarpSans"
+
 static int  ConvertClassAndStyle(int winclass, int style, USHORT *os2class, BOOL *fIconBmp);
 static int  ConvertDlgStyle(int style);
@@ -213 +215 @@
                 dlgitem->offPresParams  = (USHORT)((int)dlgpparam - (int)dlgt);
                 dlgcurdata             += dlgpparam->cb + sizeof(ULONG);
-        }
+        } 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);
+        }
+  } 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);
   }
   dlgitem++;
@@ -263 +285 @@
                 szCaption += 2;
                 dlgitem->cchText = 0;
-                dlgitem->offText = 0;
+                dlgitem->offText = (USHORT)((int)dlgcurdata-(int)dlgt);
+                dlgcurdata += 1; //CB: offText == empty string
         }
         else {  //Handle Caption
@@ -459 +482 @@
                 dlgt->coffPresParams    = (USHORT)((int)dlgpparam - (int)dlgt);
                 dlgcurdata             += dlgpparam->cb;
-        }
+        } 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);
+        }
+  } 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);
@@ -560 +603 @@
 #if 0
                 if(style & WINBS_LEFTTEXT)
-                        os2style |= ;
+                        os2style |= ; //not supported
 #endif
                 style &= 0xF;
@@ -860 +903 @@
 //  }
 //  else TODO: More fonts!!!
+// "MS Sans Serif"
 //  return(FALSE);      //not found
 #else