Browse Source

wince:
*LOGFONT fixed, use unicode now
+few dialog style, ex style consts

git-svn-id: trunk@4673 -

oro06 19 years ago
parent
commit
56299d584f
3 changed files with 31 additions and 21 deletions
  1. 2 2
      rtl/wince/wininc/coredll.inc
  2. 17 13
      rtl/wince/wininc/defines.inc
  3. 12 6
      rtl/wince/wininc/struct.inc

+ 2 - 2
rtl/wince/wininc/coredll.inc

@@ -2382,8 +2382,8 @@ function CreateFile(lpFileName:LPCWSTR; dwDesiredAccess:DWORD; dwShareMode:DWORD
 function CreateFileW(lpFileName:LPCWSTR; dwDesiredAccess:DWORD; dwShareMode:DWORD; lpSecurityAttributes:LPSECURITY_ATTRIBUTES; dwCreationDisposition:DWORD;dwFlagsAndAttributes:DWORD; hTemplateFile:HANDLE):HANDLE; external KernelDLL name 'CreateFileW';
 function CreateFileMapping(hFile:HANDLE; lpFileMappingAttributes:LPSECURITY_ATTRIBUTES; flProtect:DWORD; dwMaximumSizeHigh:DWORD; dwMaximumSizeLow:DWORD;lpName:LPCWSTR):HANDLE; external KernelDLL name 'CreateFileMappingW';
 function CreateFileMappingW(hFile:HANDLE; lpFileMappingAttributes:LPSECURITY_ATTRIBUTES; flProtect:DWORD; dwMaximumSizeHigh:DWORD; dwMaximumSizeLow:DWORD;lpName:LPCWSTR):HANDLE; external KernelDLL name 'CreateFileMappingW';
-function CreateFontIndirect(_para1:PLOGFONT):HFONT; external KernelDLL name 'CreateFontIndirectW';
-function CreateFontIndirectW(_para1:PLOGFONT):HFONT; external KernelDLL name 'CreateFontIndirectW';
+function CreateFontIndirect(_para1:PLOGFONTW):HFONT; external KernelDLL name 'CreateFontIndirectW';
+function CreateFontIndirectW(_para1:PLOGFONTW):HFONT; external KernelDLL name 'CreateFontIndirectW';
 function CreateIconIndirect(piconinfo:PICONINFO):HICON; external KernelDLL name 'CreateIconIndirect';
 function CreateMenu:HMENU; external KernelDLL name 'CreateMenu';
 function CreateMutex(lpMutexAttributes:LPSECURITY_ATTRIBUTES; bInitialOwner:WINBOOL; lpName:LPCWSTR):HANDLE; external KernelDLL name 'CreateMutexW';

+ 17 - 13
rtl/wince/wininc/defines.inc

@@ -808,20 +808,23 @@
      SS_USERITEM = $a;
      SS_WHITEFRAME = $9;
      SS_WHITERECT = $6;
-     DS_3DLOOK = $4;
-     DS_ABSALIGN = $1;
-     DS_CENTER = $800;
-     DS_CENTERMOUSE = $1000;
-     DS_CONTEXTHELP = $2000;
-     DS_CONTROL = $400;
-     DS_FIXEDSYS = $8;
-     DS_LOCALEDIT = $20;
-     DS_MODALFRAME = $80;
-     DS_NOFAILCREATE = $10;
-     DS_NOIDLEMSG = $100;
-     DS_SETFONT = $40;
+    { Dialog styles }
+     DS_ABSALIGN      = $1;
+     DS_SYSMODAL      = $2;
+     DS_3DLOOK        = $4;
+     DS_FIXEDSYS      = $8;
+     DS_NOFAILCREATE  = $10;
+     DS_LOCALEDIT     = $20;
+     DS_SETFONT       = $40;
+     DS_MODALFRAME    = $80;
+     DS_NOIDLEMSG     = $100;
      DS_SETFOREGROUND = $200;
-     DS_SYSMODAL = $2;
+     DS_CONTROL       = $400;
+     DS_CENTER        = $800;
+     DS_CENTERMOUSE   = $1000;
+     DS_CONTEXTHELP   = $2000;
+     DS_NOCLOSEBTN    =	$4000;
+
   { CreateWindowEx  }
      WS_EX_LEFT             = 0;
      WS_EX_LTRREADING       = 0;
@@ -845,6 +848,7 @@
      WS_EX_STATICEDGE       = $20000;
      WS_EX_APPWINDOW        = $40000;
      WS_EX_NOANIMATION	    = $4000000;
+     WS_EX_NOACTIVATE       = $8000000;
      WS_EX_INK		    = $10000000;
      WS_EX_ABOVESTARTUP	    = $20000000;
      WS_EX_NODRAG           = $40000000;

+ 12 - 6
rtl/wince/wininc/struct.inc

@@ -707,7 +707,7 @@
      LPCHOOSECOLOR = ^TCHOOSECOLOR;
      PCHOOSECOLOR = ^TCHOOSECOLOR;
 
-     LOGFONT = record
+     LOGFONTA = record
           lfHeight : LONG;
           lfWidth : LONG;
           lfEscapement : LONG;
@@ -723,11 +723,10 @@
           lfPitchAndFamily : BYTE;
           lfFaceName : array[0..(LF_FACESIZE)-1] of TCHAR;
        end;
-     LPLOGFONT = ^LOGFONT;
-     TLOGFONT = LOGFONT;
-     TLOGFONTA = LOGFONT;
-     PLOGFONT = ^LOGFONT;
-     PLOGFONTA = PLOGFONT;
+     TLOGFONTA = LOGFONTA;
+     tagLOGFONTA = LOGFONTA;
+     NPLOGFONTA = ^LOGFONTA;
+     PLOGFONTA = ^LOGFONTA;
 
      LOGFONTW = record
          lfHeight: LONG;
@@ -751,6 +750,13 @@
      TLogFontW = LOGFONTW;
      PLogFontW = ^TLogFontW;
 
+     TLOGFONT = LOGFONTW;
+     LOGFONT = LOGFONTW;
+     tagLOGFONT = LOGFONTW;
+     LPLOGFONT = ^LOGFONTW;
+     PLOGFONT = ^LOGFONTW;
+     NPLOGFONT = ^LOGFONTW;
+
      TCHOOSEFONTW = record //+commdlg
           lStructSize : DWORD;
           hwndOwner : HWND;