*wince : api commctl update : propertysheet/tabsheet

git-svn-id: trunk@2924 -

rtl/wince/wininc/commctrl.inc

@@ -54,7 +54,6 @@
              4    CommandBar_Show
             63    CreateMRUListA
             64    CreateMRUListW
-            19    CreatePropertySheetPageW
             17    CreateStatusWindowW
             15    CreateToolbar
             16    CreateToolbarEx
@@ -101,7 +100,6 @@
                   ListView_SetItemSpacing
             75    PopulateComboWithMRU
             76    PopulateMenuWithMRU
-            18    PropertySheetW
             80    SHCreateDefaultGradient
             79    SHDrawGradient
             81    SHDrawText
@@ -118,6 +116,8 @@
 //*****************************************************************************
 // consts
 //*****************************************************************************
+const
+  COMCTL32_VERSION=$020c;
 
 //*****************************************************************************
 // types
@@ -131,8 +131,10 @@
 {$endif read_interface}
 
 { already defined in func.inc
-procedure InitCommonControls; external ComctlDLL name 'InitCommonControls';
-function InitCommonControlsEx(LPINITCOMMONCONTROLSEX):WINBOOL; external ComctlDLL name 'InitCommonControlsEx';
+CreatePropertySheetPageW
+InitCommonControls
+InitCommonControlsEx
+PropertySheetW
 }
 
 {$ifdef read_implementation}

rtl/wince/wininc/defines.inc

@@ -3188,36 +3188,59 @@ Const
      PSP_USEREFPARENT = 64;
      PSP_USETITLE = 8;
      PSP_RTLREADING = 16;
-  { PROPSHEETHEADER structure  }
+     PSP_PREMATURE = $0400; //prsht
+
+  { PROPSHEETHEADER structure  }  //prsht
      PSH_DEFAULT = 0;
-     PSH_HASHELP = 512;
-     PSH_MODELESS = 1024;
-     PSH_NOAPPLYNOW = 128;
-     PSH_PROPSHEETPAGE = 8;
      PSH_PROPTITLE = 1;
-     PSH_USECALLBACK = 256;
      PSH_USEHICON = 2;
      PSH_USEICONID = 4;
-     PSH_USEPSTARTPAGE = 64;
+     PSH_PROPSHEETPAGE = 8;
+     PSH_WIZARDHASFINISH = $0010;
      PSH_WIZARD = 32;
+     PSH_USEPSTARTPAGE = 64;
+     PSH_NOAPPLYNOW = 128;
+     PSH_USECALLBACK = 256;
+     PSH_HASHELP = 512;
+     PSH_MODELESS = 1024;
      PSH_RTLREADING = 2048;
+     PSH_WIZARDCONTEXTHELP = $1000;
+     PSH_MAXIMIZE          = $2000;
+     PSH_NOCANCELBUTTON    = $80000000; //specific ppc
+
      PSCB_INITIALIZED = 1;
      PSCB_PRECREATE = 2;
-  { PSN_APPLY message  }
+     PSCB_GETVERSION = 3;
+     PSCB_GETTITLE   = 4;
+     PSCB_GETLINKTEXT = 5;
+
+  { PSN_APPLY message  } //prsht
      PSNRET_NOERROR = 0;
+     PSNRET_INVALID  = 1;
      PSNRET_INVALID_NOCHANGEPAGE = 2;
+
   { Property Sheet  }
+     PROP_SM_CXDLG = 212;
+     PROP_SM_CYDLG = 188;
+     PROP_MED_CXDLG = 227;
+     PROP_MED_CYDLG = 215;
+     PROP_LG_CXDLG = 252;
+     PROP_LG_CYDLG = 218;
+
      PSBTN_APPLYNOW = 4;
      PSBTN_BACK = 0;
      PSBTN_CANCEL = 5;
      PSBTN_FINISH = 2;
      PSBTN_HELP = 6;
+     PSBTN_MAX  = 6; //prsht
      PSBTN_NEXT = 1;
      PSBTN_OK = 3;
+
      PSWIZB_BACK = 1;
      PSWIZB_NEXT = 2;
      PSWIZB_FINISH = 4;
      PSWIZB_DISABLEDFINISH = 8;
+
      ID_PSREBOOTSYSTEM = 3;
      ID_PSRESTARTWINDOWS = 2;
      WIZ_BODYCX = 184;
@@ -3225,6 +3248,7 @@ Const
      WIZ_CXBMP = 80;
      WIZ_CXDLG = 276;
      WIZ_CYDLG = 140;
+
   { VX_FIXEDFILEINFO structure  }
     { was #define dname def_expr }
     function VS_FILE_INFO : LPTSTR;

rtl/wince/wininc/messages.inc

@@ -64,6 +64,9 @@
     { UNICODE  }
 
     const
+    
+       WM_USER = 1024;  //keep it first
+
        ACM_PLAY = 1125;
        ACM_STOP = 1126;
        ACN_START = 1;
@@ -254,18 +257,15 @@
      HDM_INSERTITEMA = 4609;
      HDM_SETITEMA = 4612;
 {$ifdef UNICODE}
-
-  const
      HDM_GETITEM = HDM_GETITEMW;
      HDM_INSERTITEM = HDM_INSERTITEMW;
      HDM_SETITEM = HDM_SETITEMW;
 {$else}
-
-  const
      HDM_GETITEM = HDM_GETITEMA;
      HDM_INSERTITEM = HDM_INSERTITEMA;
      HDM_SETITEM = HDM_SETITEMA;
 {$endif}
+
   { UNICODE  }
 
   const
@@ -530,51 +530,47 @@
      PBM_SETRANGE = 1025;
      PBM_SETSTEP = 1028;
      PBM_STEPIT = 1029;
-  { Property sheets  }
-     PSM_ADDPAGE = 1127;
-     PSM_APPLY = 1134;
-     PSM_CANCELTOCLOSE = 1131;
-     PSM_CHANGED = 1128;
-     PSM_GETTABCONTROL = 1140;
-     PSM_GETCURRENTPAGEHWND = 1142;
-     PSM_ISDIALOGMESSAGE = 1141;
+  { Property sheets  } //prsht
+     PSM_SETCURSEL          = (WM_USER + 101);
+     PSM_REMOVEPAGE         = (WM_USER + 102);
+     PSM_ADDPAGE            = (WM_USER + 103);
+     PSM_CHANGED            = (WM_USER + 104);
+     PSM_RESTARTWINDOWS     = (WM_USER + 105);
+     PSM_REBOOTSYSTEM       = (WM_USER + 106);
+     PSM_CANCELTOCLOSE      = (WM_USER + 107);
+     PSM_QUERYSIBLINGS      = (WM_USER + 108);
+     PSM_UNCHANGED          = (WM_USER + 109);
+     PSM_APPLY              = (WM_USER + 110);
+     PSM_SETTITLEA          = (WM_USER + 111);
+     PSM_SETWIZBUTTONS      = (WM_USER + 112);
+     PSM_SETCURSELID        = (WM_USER + 114);
+     PSM_SETFINISHTEXTA     = (WM_USER + 115);
+     PSM_GETTABCONTROL      = (WM_USER + 116);
+     PSM_ISDIALOGMESSAGE    = (WM_USER + 117);
+     PSM_GETCURRENTPAGEHWND = (WM_USER + 118);
+     PSM_SETTITLEW          = (WM_USER + 120);
+     PSM_SETFINISHTEXTW     = (WM_USER + 121);
      PSM_PRESSBUTTON = 1137;
-     PSM_QUERYSIBLINGS = 1132;
-     PSM_REBOOTSYSTEM = 1130;
-     PSM_REMOVEPAGE = 1126;
-     PSM_RESTARTWINDOWS = 1129;
-     PSM_SETCURSEL = 1125;
-     PSM_SETCURSELID = 1138;
-     PSM_SETFINISHTEXTW = 1145;
-     PSM_SETTITLEW = 1144;
-     PSM_SETFINISHTEXTA = 1139;
-     PSM_SETTITLEA = 1135;
 {$ifdef UNICODE}
-
-  const
      PSM_SETFINISHTEXT = PSM_SETFINISHTEXTW;
      PSM_SETTITLE = PSM_SETTITLEW;
-{$else}
-
-  const
+{$else UNICODE}
      PSM_SETFINISHTEXT = PSM_SETFINISHTEXTA;
      PSM_SETTITLE = PSM_SETTITLEA;
-{$endif}
-  { UNICODE  }
+{$endif UNICODE}
+
+  { Property sheet notifications  } //prsht
+     PSN_FIRST       = -(200);
+     PSN_SETACTIVE   = (PSN_FIRST-0);
+     PSN_KILLACTIVE  = (PSN_FIRST-1);
+     PSN_APPLY       = (PSN_FIRST-2);
+     PSN_RESET       = (PSN_FIRST-3);
+     PSN_HELP        = (PSN_FIRST-5);
+     PSN_WIZBACK     = (PSN_FIRST-6);
+     PSN_WIZNEXT     = (PSN_FIRST-7);
+     PSN_WIZFINISH   = (PSN_FIRST-8);
+     PSN_QUERYCANCEL = (PSN_FIRST-9);
 
-  const
-     PSM_SETWIZBUTTONS = 1136;
-     PSM_UNCHANGED = 1133;
-  { Property sheet notifications  }
-     PSN_APPLY = -(202);
-     PSN_HELP = -(205);
-     PSN_KILLACTIVE = -(201);
-     PSN_QUERYCANCEL = -(209);
-     PSN_RESET = -(203);
-     PSN_SETACTIVE = -(200);
-     PSN_WIZBACK = -(206);
-     PSN_WIZFINISH = -(208);
-     PSN_WIZNEXT = -(207);
   { Status window  }
      SB_GETBORDERS = 1031;
      SB_GETPARTS = 1030;
@@ -1160,7 +1156,7 @@
      WM_TIMECHANGE = 30;
      WM_TIMER = 275;
      WM_UNDO = 772;
-     WM_USER = 1024;
+     //WM_USER = 1024; moved at start
      WM_USERCHANGED = 84;
      WM_VKEYTOITEM = 46;
      WM_VSCROLL = 277;

rtl/wince/wininc/struct.inc

@@ -5984,7 +5984,7 @@
      LPFNPSPCALLBACK = function (_para1:HWND; _para2:UINT; _para3:LPVOID):UINT;stdcall;
      TFNPSPCALLBACK = LPFNPSPCALLBACK;
 
-     PROPSHEETPAGE = record
+     PROPSHEETPAGEA = record
           dwSize : DWORD;
           dwFlags : DWORD;
           hInstance : HINST;
@@ -6002,18 +6002,52 @@
                         );
                 );
        end;
-     LPPROPSHEETPAGE = ^PROPSHEETPAGE;
-     LPCPROPSHEETPAGE = ^PROPSHEETPAGE;
-     _PROPSHEETPAGE = PROPSHEETPAGE;
-     TPROPSHEETPAGE = PROPSHEETPAGE;
-     PPROPSHEETPAGE = ^PROPSHEETPAGE;
+     LPPROPSHEETPAGEA = ^PROPSHEETPAGEA;
+     LPCPROPSHEETPAGEA = ^PROPSHEETPAGEA;
+
+     PROPSHEETPAGEW = record
+          dwSize : DWORD;
+          dwFlags : DWORD;
+          hInstance : HINST;
+          case longint of
+            0 : (pszTemplate : LPCWSTR);
+            1 : (pResource : LPCDLGTEMPLATE;
+                 case longint of
+                    0 : (hIcon : HICON);
+                    1 : (pszIcon : LPCWSTR;
+                         pszTitle : LPCWSTR;
+                         pfnDlgProc : DLGPROC;
+                         lParam : LPARAM;
+                         pfnCallback : LPFNPSPCALLBACK;
+                         pcRefParent : ^UINT;
+                        );
+                );
+       end;
+     LPPROPSHEETPAGEW = ^PROPSHEETPAGEW;
+     LPCPROPSHEETPAGEW = ^PROPSHEETPAGEW;
+
+{$IFDEF UNICODE}
+     LPPROPSHEETPAGE = ^PROPSHEETPAGEW;
+     LPCPROPSHEETPAGE = ^PROPSHEETPAGEW;
+     _PROPSHEETPAGE = PROPSHEETPAGEW;
+     PROPSHEETPAGE = PROPSHEETPAGEW;
+     TPROPSHEETPAGE = PROPSHEETPAGEW;
+     PPROPSHEETPAGE = ^PROPSHEETPAGEW;
+{$ELSE UNICODE}
+     LPPROPSHEETPAGE = ^PROPSHEETPAGEA;
+     LPCPROPSHEETPAGE = ^PROPSHEETPAGEA;
+     _PROPSHEETPAGE = PROPSHEETPAGEA;
+     PROPSHEETPAGE = PROPSHEETPAGEA;
+     TPROPSHEETPAGE = PROPSHEETPAGEA;
+     PPROPSHEETPAGE = ^PROPSHEETPAGEA;
+{$ENDIF UNICODE}
 
      emptyrecord = record
        end;
      lpemptyrecord = ^emptyrecord;
      HPROPSHEETPAGE = ^emptyrecord;
 
-     PROPSHEETHEADER = record
+     PROPSHEETHEADERA = record //prsht
           dwSize : DWORD;
           dwFlags : DWORD;
           hwndParent : HWND;
@@ -6042,11 +6076,9 @@
                           );
                   );
        end;
-     LPPROPSHEETHEADER = ^PROPSHEETHEADER;
-     LPCPROPSHEETHEADER = ^PROPSHEETHEADER;
-     _PROPSHEETHEADER = PROPSHEETHEADER;
-     TPROPSHEETHEADER = PROPSHEETHEADER;
-     PPROPSHEETHEADER = ^PROPSHEETHEADER;
+     LPPROPSHEETHEADERA = ^PROPSHEETHEADERA;
+     LPCPROPSHEETHEADERA = ^PROPSHEETHEADERA;
+     PPROPSHEETHEADERA = ^PROPSHEETHEADERA;
 
      PROPSHEETHEADERW = record //prsht
           dwSize : DWORD;
@@ -6069,8 +6101,27 @@
                           );
                   );
        end;
+
+     LPPROPSHEETHEADERW = ^PROPSHEETHEADERW;
      LPCPROPSHEETHEADERW = ^PROPSHEETHEADERW;
-     _PROPSHEETHEADERW = PROPSHEETHEADERW;
+     PPROPSHEETHEADERW = ^PROPSHEETHEADERW;
+
+{$IFDEF UNICODE}
+     _PROPSHEETHEADER = PROPSHEETHEADERW;
+     PROPSHEETHEADER = PROPSHEETHEADERW;
+     TPROPSHEETHEADER = PROPSHEETHEADERW;
+     PPROPSHEETHEADER = ^PROPSHEETHEADERW;
+     LPPROPSHEETHEADER = ^PROPSHEETHEADERW;
+     LPCPROPSHEETHEADER = ^PROPSHEETHEADERW;
+{$ELSE UNICODE}
+     _PROPSHEETHEADER = PROPSHEETHEADERA;
+     PROPSHEETHEADER = PROPSHEETHEADERA;
+     TPROPSHEETHEADER = PROPSHEETHEADERA;
+     PPROPSHEETHEADER = ^PROPSHEETHEADERA;
+     LPPROPSHEETHEADER = ^PROPSHEETHEADERA;
+     LPCPROPSHEETHEADER = ^PROPSHEETHEADERA;
+{$ENDIF UNICODE}
+
 
      { PropertySheet callbacks  }
      LPFNADDPROPSHEETPAGE = function (_para1:HPROPSHEETPAGE; _para2:LPARAM):WINBOOL;stdcall;

rtl/wince/wininc/unidef.inc

@@ -176,7 +176,7 @@ function PageSetupDlg(_para1:LPPAGESETUPDLGW):WINBOOL; external ComdlgDLL name '
 function PeekMessage(lpMsg:LPMSG; hWnd:HWND; wMsgFilterMin:UINT; wMsgFilterMax:UINT; wRemoveMsg:UINT):WINBOOL; external UserDLLCore name 'PeekMessageW';
 function PostThreadMessage(idThread:DWORD; Msg:UINT; wParam:WPARAM; lParam:LPARAM):WINBOOL; external UserDLLCore name 'PostThreadMessageW';
 function PostMessage(hWnd:HWND; Msg:UINT; wParam:WPARAM; lParam:LPARAM):WINBOOL; external UserDLLCore name 'PostMessageW';
-function PropertySheet(lppsph:LPCPROPSHEETHEADERW):longint; external ComctlDll name 'PropertySheetW';
+function PropertySheet(lppsph:LPCPROPSHEETHEADER):longint; external ComctlDll name 'PropertySheetW';
 function RegCreateKeyEx(hKey:HKEY; lpSubKey:LPCWSTR; Reserved:DWORD; lpClass:LPWSTR; dwOptions:DWORD;samDesired:REGSAM; lpSecurityAttributes:LPSECURITY_ATTRIBUTES; phkResult:PHKEY; lpdwDisposition:LPDWORD):LONG;
   external AdvapiDLLCore name 'RegCreateKeyExW';
 function RegDeleteKey(hKey:HKEY; lpSubKey:LPCWSTR):LONG; external AdvapiDLLCore name 'RegDeleteKeyW';