Changeset 1966 for trunk/src/gdi32/font.cpp

Timestamp:

Dec 4, 1999, 2:53:14 PM (26 years ago)

Author:

hugh

Message:

Implemented DEFAULT_GUI_FONT for GetStockObject
DIBSecttion now get the DC Palette on creation and updated if DC pal changes.

File:

• trunk/src/gdi32/font.cpp (modified) (10 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.6 1999-11-11 19:09:34 sandervl Exp $ */
+/* $Id: font.cpp,v 1.7 1999-12-04 13:53:12 hugh Exp $ */
 
 /*
@@ -37 +37 @@
 
 typedef struct {
-        DWORD userProc;
-        DWORD userData;
-        DWORD dwFlags;
+  DWORD userProc;
+  DWORD userData;
+  DWORD dwFlags;
 } ENUMUSERDATA;
 
@@ -72 +72 @@
   { HANGEUL_CHARSET, 949, FS(19)},
   { CHINESEBIG5_CHARSET, 950, FS(20)},
-  { JOHAB_CHARSET, 1361, FS(21)}, 
+  { JOHAB_CHARSET, 1361, FS(21)},
   /* reserved for alternate ANSI and OEM */
   { DEFAULT_CHARSET, 0, FS(0)},
@@ -266 +266 @@
 {
  ENUMUSERDATA *lpEnumData = (ENUMUSERDATA *)arg4;
- FONTENUMPROCA proc = (FONTENUMPROCA)lpEnumData->userProc; 
+ FONTENUMPROCA proc = (FONTENUMPROCA)lpEnumData->userProc;
 
   return proc(lpLogFont, lpTextM, arg3, lpEnumData->userData);
@@ -276 +276 @@
 {
  ENUMUSERDATA *lpEnumData = (ENUMUSERDATA *)arg4;
- FONTENUMPROCW proc = (FONTENUMPROCW)lpEnumData->userProc; 
+ FONTENUMPROCW proc = (FONTENUMPROCW)lpEnumData->userProc;
  ENUMLOGFONTW LogFont;
  NEWTEXTMETRICW textM;
@@ -321 +321 @@
 {
  ENUMUSERDATA *lpEnumData = (ENUMUSERDATA *)arg4;
- FONTENUMPROCEXA proc = (FONTENUMPROCEXA)lpEnumData->userProc; 
+ FONTENUMPROCEXA proc = (FONTENUMPROCEXA)lpEnumData->userProc;
  ENUMLOGFONTEXA logFont;
  NEWTEXTMETRICEXA textM;
@@ -340 +340 @@
 {
  ENUMUSERDATA *lpEnumData = (ENUMUSERDATA *)arg4;
- FONTENUMPROCEXW proc = (FONTENUMPROCEXW)lpEnumData->userProc; 
+ FONTENUMPROCEXW proc = (FONTENUMPROCEXW)lpEnumData->userProc;
  ENUMLOGFONTEXW LogFont;
  NEWTEXTMETRICEXW textM;
@@ -598 +598 @@
  * Fills a CHARSETINFO structure for a character set, code page, or
  * font. This allows making the correspondance between different labelings
- * (character set, Windows, ANSI, and OEM codepages, and Unicode ranges) 
+ * (character set, Windows, ANSI, and OEM codepages, and Unicode ranges)
  * of the same encoding.
  *
@@ -613 +613 @@
        if flags == TCI_SRCCHARSET: a character set value
        if flags == TCI_SRCCODEPAGE: a code page value
-                 */
+     */
   LPCHARSETINFO lpCs, /* structure to receive charset information */
   DWORD flags /* determines interpretation of lpSrc */
@@ -620 +620 @@
     switch (flags) {
     case TCI_SRCFONTSIG:
-        while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++;
+  while (!(*lpSrc>>index & 0x0001) && index<MAXTCIINDEX) index++;
       break;
     case TCI_SRCCODEPAGE: